Merge branch 'master' into next

12 files changed, 44 insertions, 0 deletions

diff --git a/gnuradio-core/src/lib/filter/gri_goertzel.cc b/gnuradio-core/src/lib/filter/gri_goertzel.cc
index 85e66c069..73b8366ab 100644
--- a/gnuradio-core/src/lib/filter/gri_goertzel.cc
+++ b/gnuradio-core/src/lib/filter/gri_goertzel.cc
@@ -20,6 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <cmath>
 
 #include <gri_goertzel.h>
diff --git a/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc b/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc
index 63654a280..d158ff00d 100644
--- a/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc
+++ b/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <cppunit/TestAssert.h>
 #include <qa_gri_mmse_fir_interpolator.h>
 #include <gri_mmse_fir_interpolator.h>
diff --git a/gnuradio-core/src/lib/general/gr_circular_file.cc b/gnuradio-core/src/lib/general/gr_circular_file.cc
index c9222597a..4d88b9d99 100644
--- a/gnuradio-core/src/lib/general/gr_circular_file.cc
+++ b/gnuradio-core/src/lib/general/gr_circular_file.cc
@@ -42,6 +42,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 static const int HEADER_SIZE = 4096;
 static const int HEADER_MAGIC = 0xEB021026;
 
diff --git a/gnuradio-core/src/lib/general/gr_firdes.cc b/gnuradio-core/src/lib/general/gr_firdes.cc
index 5d192d67e..13110d57d 100644
--- a/gnuradio-core/src/lib/general/gr_firdes.cc
+++ b/gnuradio-core/src/lib/general/gr_firdes.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gr_firdes.h>
 #include <stdexcept>
 
diff --git a/gnuradio-core/src/lib/general/gr_random.cc b/gnuradio-core/src/lib/general/gr_random.cc
index 67f760006..52140acc2 100644
--- a/gnuradio-core/src/lib/general/gr_random.cc
+++ b/gnuradio-core/src/lib/general/gr_random.cc
@@ -35,6 +35,9 @@
  * 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <math.h>
 #include <gr_random.h>
 
diff --git a/gnuradio-core/src/lib/general/gri_float_to_char.cc b/gnuradio-core/src/lib/general/gri_float_to_char.cc
index a17b01f55..28f15a3b3 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_char.cc
+++ b/gnuradio-core/src/lib/general/gri_float_to_char.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _ISOC9X_SOURCE
 #include <gri_float_to_char.h>
 #include <math.h>
diff --git a/gnuradio-core/src/lib/general/gri_float_to_short.cc b/gnuradio-core/src/lib/general/gri_float_to_short.cc
index 13afc51d9..93a2784f5 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_short.cc
+++ b/gnuradio-core/src/lib/general/gri_float_to_short.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _ISOC9X_SOURCE
 #include <gri_float_to_short.h>
 #include <math.h>
diff --git a/gnuradio-core/src/lib/general/gri_float_to_uchar.cc b/gnuradio-core/src/lib/general/gri_float_to_uchar.cc
index 394cbc100..a022c95d8 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_uchar.cc
+++ b/gnuradio-core/src/lib/general/gri_float_to_uchar.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _ISOC9X_SOURCE
 #include <gri_float_to_uchar.h>
 #include <math.h>
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
index 09fb6c826..11e0a8eb9 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
@@ -34,6 +34,9 @@
 #include <stdexcept>
 #include <stdio.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
   : gr_sync_block ("file_descriptor_sink",
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
index 700ad4aef..334a57848 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
@@ -35,6 +35,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
 						      int fd,
diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
index 154611c32..91618bad6 100644
--- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
@@ -34,6 +34,10 @@
 #include <iostream>
 #include <gr_tag_info.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 #ifdef O_BINARY
 #define	OUR_O_BINARY O_BINARY
 #else
diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
index 668f04cad..14f2b8589 100644
--- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
+++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "microtune_xxxx_eval_board.h"
 #include "microtune_eval_board_defs.h"
 #include "microtune_xxxx.h"