From d86046ab8fdac1d79d7b1a8fa2ea9f62ac3f359d Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 6 Jun 2008 01:06:47 +0200
Subject: [PATCH] Move protocols/types.h content to remote.h

---
 mch/MoteHost.h      |  1 -
 mcs/Host.h          |  1 -
 mcs/Mote.h          |  1 -
 protocols/tcputil.h |  1 -
 protocols/types.h   | 17 -----------------
 remote.h            |  7 +++++++
 6 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 protocols/types.h

diff --git a/mch/MoteHost.h b/mch/MoteHost.h
index 62ca342..88ac5da 100644
--- a/mch/MoteHost.h
+++ b/mch/MoteHost.h
@@ -3,7 +3,6 @@
 
 #include "remote.h"
 
-#include "protocols/types.h"
 #include "protocols/tcputil.h"
 #include "protocols/Message.h"
 #include "protocols/motecontrol/MoteMsg.h"
diff --git a/mcs/Host.h b/mcs/Host.h
index 463a913..dfdadaa 100644
--- a/mcs/Host.h
+++ b/mcs/Host.h
@@ -11,7 +11,6 @@
 #include "protocols/host_server/MsgMoteConnectionInfoList.h"
 #include "protocols/host_server/MsgPlugEvent.h"
 #include "protocols/tcputil.h"
-#include "protocols/types.h"
 
 #include "mcs/FileDescriptor.h"
 #include "mcs/Mote.h"
diff --git a/mcs/Mote.h b/mcs/Mote.h
index 1e03454..25bfdec 100644
--- a/mcs/Mote.h
+++ b/mcs/Mote.h
@@ -3,7 +3,6 @@
 
 #include "remote.h"
 
-#include "protocols/types.h"
 #include "protocols/MsgPayload.h"
 
 namespace remote { namespace mcs {
diff --git a/protocols/tcputil.h b/protocols/tcputil.h
index 4de5bc7..6683d3b 100644
--- a/protocols/tcputil.h
+++ b/protocols/tcputil.h
@@ -3,7 +3,6 @@
 
 #include "remote.h"
 
-#include "protocols/types.h"
 #include "protocols/MMSException.h"
 
 namespace remote { namespace protocols {
diff --git a/protocols/types.h b/protocols/types.h
deleted file mode 100644
index 6db5003..0000000
--- a/protocols/types.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef REMOTE_PROTOCOLS__TYPES_H
-#define REMOTE_PROTOCOLS_TYPES_H
-
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-namespace remote { namespace protocols {
-
-typedef uint32_t dbkey_t;
-
-typedef uint8_t result_t;
-
-typedef uint8_t status_t;
-
-}}
-
-#endif
diff --git a/remote.h b/remote.h
index 4640a29..651e13b 100644
--- a/remote.h
+++ b/remote.h
@@ -23,6 +23,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 
@@ -41,4 +42,10 @@
 
 using namespace remote::util;
 
+namespace remote {
+	typedef uint32_t dbkey_t;
+	typedef uint8_t result_t;
+	typedef uint8_t status_t;
+}
+
 #endif
-- 
2.11.4.GIT