From f54e8dbbbaf276d5de54835c14532f514503e4e5 Mon Sep 17 00:00:00 2001
From: Jan Vidar Krey <janvidar@extatic.org>
Date: Tue, 26 Jan 2010 22:54:14 +0100
Subject: [PATCH] Moved the timeout code to where it belongs, along with the
 network backend code.

---
 GNUmakefile                     | 2 +-
 src/{util => network}/timeout.c | 1 -
 src/{util => network}/timeout.h | 0
 src/uhub.h                      | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename src/{util => network}/timeout.c (99%)
 rename src/{util => network}/timeout.h (100%)

diff --git a/GNUmakefile b/GNUmakefile
index fcea83e..a74abda 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -136,6 +136,7 @@ libuhub_SOURCES := \
 		src/network/epoll.c \
 		src/network/network.c \
 		src/network/select.c \
+		src/network/timeout.c \
 		src/network/timer.c \
 		src/util/ipcalc.c \
 		src/util/list.c \
@@ -143,7 +144,6 @@ libuhub_SOURCES := \
 		src/util/memory.c \
 		src/util/misc.c \
 		src/util/rbtree.c \
-		src/util/timeout.c \
 		src/util/tiger.c
 
 libadc_common_SOURCES := \
diff --git a/src/util/timeout.c b/src/network/timeout.c
similarity index 99%
rename from src/util/timeout.c
rename to src/network/timeout.c
index b89eb6c..71c62bf 100644
--- a/src/util/timeout.c
+++ b/src/network/timeout.c
@@ -18,7 +18,6 @@
  */
 
 #include "uhub.h"
-#include "util/timeout.h"
 
 void timeout_evt_initialize(struct timeout_evt* t, timeout_evt_cb cb, void* ptr)
 {
diff --git a/src/util/timeout.h b/src/network/timeout.h
similarity index 100%
rename from src/util/timeout.h
rename to src/network/timeout.h
diff --git a/src/uhub.h b/src/uhub.h
index 505122c..adeaa52 100644
--- a/src/uhub.h
+++ b/src/uhub.h
@@ -62,13 +62,13 @@ extern "C" {
 #include "util/log.h"
 #include "util/memory.h"
 #include "util/misc.h"
-#include "util/timeout.h"
 #include "util/tiger.h"
 
 #include "adc/sid.h"
 #include "adc/message.h"
 #include "network/network.h"
 #include "network/connection.h"
+#include "network/timeout.h"
 
 #include "core/auth.h"
 #include "core/config.h"