diff options
| author | Johnathan Corgan | 2011-07-26 16:44:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-07-26 16:44:18 -0700 |
| commit | d0112efa115d049a4bad62a1c6faac05332c8cf5 (patch) | |
| tree | 13a738fed85f9c8908b19489640f744d33f4324b /gnuradio-core/src/lib/general | |
| parent | c6c773757ef16aa8edac173a5b9bca270a658b9f (diff) | |
| parent | 7ab44e1b23a1a9307b5edfc12dcd4f4b7c834a6e (diff) | |
| download | gnuradio-d0112efa115d049a4bad62a1c6faac05332c8cf5.tar.gz gnuradio-d0112efa115d049a4bad62a1c6faac05332c8cf5.tar.bz2 gnuradio-d0112efa115d049a4bad62a1c6faac05332c8cf5.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib/general')
6 files changed, 23 insertions, 0 deletions
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> |