From 92e6d940bc12147d2265d944c15085c355132b26 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 2 Jan 2015 17:07:49 -0500
Subject: [PATCH] ifdef's for BSD and cleanup

---
 src/zm_comms.cpp | 6 ------
 src/zm_comms.h   | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index a9d542618..45385aa2f 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -26,15 +26,9 @@
 #include <stdarg.h>
 //#include <memory.h>
 #include <alloca.h>
-#include <string.h>
 //#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
-#if defined(BSD)
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
 #include <netinet/tcp.h>
 
 int CommsBase::readV( int iovcnt, /* const void *, int, */ ... )
diff --git a/src/zm_comms.h b/src/zm_comms.h
index 60d4a3ad4..ef1dda833 100644
--- a/src/zm_comms.h
+++ b/src/zm_comms.h
@@ -22,6 +22,7 @@
 
 #include "zm_exception.h"
 
+#include <string.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <errno.h>
@@ -30,6 +31,12 @@
 #include <set>
 #include <vector>
 
+#if defined(BSD)
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
 class CommsException : public Exception
 {
 public: