Merged gr-msdd6000 portability fix to trunk (eb/msdd -r8940:9027)

[debian/gnuradio] / gr-msdd6000 / src / msdd_source_base.cc

diff --git a/gr-msdd6000/src/msdd_source_base.cc b/gr-msdd6000/src/msdd_source_base.cc
index 79f37b139e328713c1c25e19ff17bca1490e760a..8adb72553a6d5c302a7e70cf12aa2d6a059a956b 100644 (file)
--- a/gr-msdd6000/src/msdd_source_base.cc
+++ b/gr-msdd6000/src/msdd_source_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,20 +24,27 @@
 //#define MSDD_DEBUG2_TRUE
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <msdd_source_base.h>
 #include <gr_io_signature.h>
 #include <assert.h>
-#include <netdb.h>
 #include <omnithread.h>
 #include <stdexcept>
+#include <iostream>
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+
 
 #ifdef MSDD_DEBUG_TRUE
-#include <iostream>
 #define MSDD_DEBUG(x) std::cout << x << std::endl;
 #else
 #define MSDD_DEBUG(x)
@@ -45,13 +52,11 @@
 
 
 #ifdef MSDD_DEBUG2_TRUE
-#include <iostream>
 #define MSDD_DEBUG2(x) std::cout << x << std::endl;
 #else
 #define MSDD_DEBUG2(x)
 #endif
 
-#include <iostream>
 
 namespace {
        const int OUTPUT_MAX((1 << 15)*8);