[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Patch-gnuradio] Patch: build fix for gcc 3.4
|
From: |
Eric Blossom |
|
Subject: |
Re: [Patch-gnuradio] Patch: build fix for gcc 3.4 |
|
Date: |
Mon, 21 Apr 2008 20:06:17 -0700 |
|
User-agent: |
Mutt/1.5.17 (2007-11-01) |
On Mon, Apr 21, 2008 at 11:31:10PM +0200, Marek Mahut wrote:
> Dear upstream,
>
> I don't have copyright assignment with the FSF yet. However this patch
> is a small, but I would like to request it for future contribution to FSF
> related projects.
>
> This patch fixes gnuradio 3.1.2 to be able to build under new gcc 3.4
> [1]. In this newest gcc version many C/C++ compiler headers were cleaned
> from unnecessary includes, so applications who did not include ones they
> use explicitly failed to build, it's the case of gnuradio as well. We,
> in Fedora, are using attached patch to fix this problem.
>
> [1] http://gcc.gnu.org/gcc-3.4/
>
> Have a nice day,
>
> --
> Marek Mahut https://fedoraproject.org/wiki/SIGs/Astronomy/
> Fedora Project http://www.jamendo.com/
> Marek Mahut <address@hidden>: Patch to fix build under gcc 3.4
Hi Marek, thanks!
I noticed that sometimes you used <string.h> and other times
<cstring> and once or twice both of them. What's your rationale?
Shouldn't either one of them work for all cases?
Eric
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -38,6 +38,7 @@
> #include <gr_firdes.h>
>
> #include <iostream>
> +#include <string.h>
>
> gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const
> std::vector<gr_complex> &taps)
> {
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -33,6 +33,7 @@
> #include <gr_firdes.h>
>
> #include <iostream>
> +#include <string.h>
>
> gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const
> std::vector<float> &taps)
> {
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -47,6 +47,7 @@
> #include <cppunit/TestAssert.h>
> #include <random.h>
> #include <malloc16.h>
> +#include <cstring>
>
> using std::vector;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -47,6 +47,7 @@
> #include <cppunit/TestAssert.h>
> #include <random.h>
> #include <malloc16.h>
> +#include <cstring>
>
> using std::vector;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -46,6 +46,7 @@
> #include <gr_types.h>
> #include <cppunit/TestAssert.h>
> #include <random.h>
> +#include <cstring>
>
> using std::vector;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -32,6 +32,7 @@
> #include <cmath>
> #include <cppunit/TestAssert.h>
> #include <random.h>
> +#include <cstring>
>
> using std::vector;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -46,6 +46,7 @@
> #include <gr_types.h>
> #include <cppunit/TestAssert.h>
> #include <random.h>
> +#include <cstring>
>
> using std::vector;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <stdexcept>
> +#include <string.h>
>
> //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation
> of the align algoritm which exactly follows the align_interval spec.
> //It is more resource intensive, less tested and probably not needed
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_bin_statistics_f.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_bin_statistics_f_sptr
> gr_make_bin_statistics_f(unsigned int vlen,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_circular_file.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_circular_file.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -39,6 +39,8 @@
> #include <stdlib.h>
>
> #include <algorithm>
> +#include <stdio.h>
> +#include <string.h>
>
> static const int HEADER_SIZE = 4096;
> static const int HEADER_MAGIC = 0xEB021026;
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_delay.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_delay.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_delay.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_delay.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_delay.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_delay_sptr
> gr_make_delay (size_t itemsize, int delay)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <gr_io_signature.h>
> #include <string.h>
> #include <stdexcept>
> +#include <cstring>
>
> static const int PAD_VAL = 0xAA;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vcc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vcc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <gr_io_signature.h>
> #include <gri_fft.h>
> #include <math.h>
> +#include <string.h>
>
> gr_fft_vcc_sptr
> gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> window,
> bool shift)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <gri_fft.h>
> #include <math.h>
> #include <stdexcept>
> +#include <string.h>
>
>
> // FIXME after this is working, change to use native real to complex fft.
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_framer_sink_1.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <gr_io_signature.h>
> #include <cstdio>
> #include <stdexcept>
> +#include <string.h>
>
> #define VERBOSE 0
>
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_head.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_head.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_head.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_head.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -25,6 +25,7 @@
> #endif
> #include <gr_head.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_head::gr_head (size_t sizeof_stream_item, int nitems)
> : gr_sync_block ("head",
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gri_fft.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gri_fft.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gri_fft.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gri_fft.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <stdio.h>
> #include <cassert>
> #include <stdexcept>
> +#include <stdio.h>
>
> static char *
> wisdom_filename ()
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_keep_one_in_n.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_keep_one_in_n_sptr
> gr_make_keep_one_in_n (size_t item_size, int n)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_log2_const.h
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_log2_const.h
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_log2_const.h
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_log2_const.h
> 2008-04-11 19:57:23.000000000 +0200
> @@ -31,16 +31,16 @@
>
> template<unsigned int k> static inline int gr_log2_const() { assert(0);
> return 0; }
>
> -template<> static inline int gr_log2_const<1>() { return 0; }
> -template<> static inline int gr_log2_const<2>() { return 1; }
> -template<> static inline int gr_log2_const<4>() { return 2; }
> -template<> static inline int gr_log2_const<8>() { return 3; }
> -template<> static inline int gr_log2_const<16>() { return 4; }
> -template<> static inline int gr_log2_const<32>() { return 5; }
> -template<> static inline int gr_log2_const<64>() { return 6; }
> -template<> static inline int gr_log2_const<128>() { return 7; }
> -template<> static inline int gr_log2_const<256>() { return 8; }
> -template<> static inline int gr_log2_const<512>() { return 9; }
> -template<> static inline int gr_log2_const<1024>(){ return 10; }
> +template<> inline int gr_log2_const<1>() { return 0; }
> +template<> inline int gr_log2_const<2>() { return 1; }
> +template<> inline int gr_log2_const<4>() { return 2; }
> +template<> inline int gr_log2_const<8>() { return 3; }
> +template<> inline int gr_log2_const<16>() { return 4; }
> +template<> inline int gr_log2_const<32>() { return 5; }
> +template<> inline int gr_log2_const<64>() { return 6; }
> +template<> inline int gr_log2_const<128>() { return 7; }
> +template<> inline int gr_log2_const<256>() { return 8; }
> +template<> inline int gr_log2_const<512>() { return 9; }
> +template<> inline int gr_log2_const<1024>(){ return 10; }
>
> #endif /* INCLUDED_GR_LOG2_CONST_H */
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_null_source.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_null_source.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_null_source.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_null_source.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_null_source.h>
> #include <gr_io_signature.h>
> +#include <cstring>
>
> gr_null_source::gr_null_source (size_t sizeof_stream_item)
> : gr_sync_block ("null_source",
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_packet_sink.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_packet_sink.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -33,6 +33,7 @@
> #include <fcntl.h>
> #include <stdexcept>
> #include <gr_count_bits.h>
> +#include <string.h>
>
> #define VERBOSE 0
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
> 2008-04-11 19:59:13.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_peak_detector2_fb.h>
> #include <gr_io_signature.h>
> +#include <cstring>
>
> gr_peak_detector2_fb_sptr
> gr_make_peak_detector2_fb (float threshold_factor_rise,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <assert.h>
> #include <stdexcept>
> #include <gr_count_bits.h>
> +#include <string.h>
>
>
> static const int THRESHOLD = 3;
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_framer.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_framer.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -29,6 +29,8 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <stdexcept>
> +#include <cstring>
> +#include <string.h>
>
>
> gr_simple_framer_sptr
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_skiphead.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_skiphead.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -25,6 +25,7 @@
> #endif
> #include <gr_skiphead.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip)
> : gr_block ("skiphead",
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_mux.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_mux.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_stream_mux.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> #define VERBOSE 0
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_stream.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_streams_to_stream.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_streams_to_stream_sptr
> gr_make_streams_to_stream (size_t item_size, size_t nstreams)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_vector.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_streams_to_vector.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_streams_to_vector_sptr
> gr_make_streams_to_vector (size_t item_size, size_t nstreams)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_streams.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_stream_to_streams.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_stream_to_streams_sptr
> gr_make_stream_to_streams (size_t item_size, size_t nstreams)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_vector.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_stream_to_vector.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_stream_to_vector_sptr
> gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block)
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_test.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_test.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_test.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_test.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <gr_io_signature.h>
> #include <stdexcept>
> #include <iostream>
> +#include <string.h>
>
> gr_test_sptr gr_make_test (const std::string &name,
> int min_inputs, int max_inputs, unsigned int sizeof_input_item,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_throttle.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_throttle.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_throttle.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_throttle.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <errno.h>
> #include <stdio.h>
> #include <math.h>
> +#include <string.h>
> #ifdef HAVE_TIME_H
> #include <time.h>
> #endif
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_stream.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_vector_to_stream.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_vector_to_stream_sptr
> gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_streams.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_vector_to_streams.h>
> #include <gr_io_signature.h>
> +#include <string.h>
>
> gr_vector_to_streams_sptr
> gr_make_vector_to_streams (size_t item_size, size_t nstreams)
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/malloc16.c
> gnuradio-3.1.2/gnuradio-core/src/lib/general/malloc16.c
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/malloc16.c
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/general/malloc16.c 2008-04-11
> 19:57:23.000000000 +0200
> @@ -7,6 +7,7 @@
>
> #include "malloc16.h"
> #include <string.h>
> +#include <strings.h>
>
> void *malloc16Align(int size){
> void *p;
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> gr_chunks_to_symbols_bc_sptr
> gr_make_chunks_to_symbols_bc (const std::vector<gr_complex> &symbol_table,
> const int D)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> gr_chunks_to_symbols_bf_sptr
> gr_make_chunks_to_symbols_bf (const std::vector<float> &symbol_table, const
> int D)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> gr_chunks_to_symbols_ic_sptr
> gr_make_chunks_to_symbols_ic (const std::vector<gr_complex> &symbol_table,
> const int D)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> gr_chunks_to_symbols_if_sptr
> gr_make_chunks_to_symbols_if (const std::vector<float> &symbol_table, const
> int D)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> gr_chunks_to_symbols_sc_sptr
> gr_make_chunks_to_symbols_sc (const std::vector<gr_complex> &symbol_table,
> const int D)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> gr_chunks_to_symbols_sf_sptr
> gr_make_chunks_to_symbols_sf (const std::vector<float> &symbol_table, const
> int D)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <gr_io_signature.h>
> #include <assert.h>
> #include <iostream>
> +#include <string.h>
>
> @SPTR_NAME@
> address@hidden@ (const std::vector<@O_TYPE@> &symbol_table, const int D)
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_cc.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <gr_mute_cc.h>
> #include <gr_io_signature.h>
> #include <string.h>
> +#include <cstring>
>
>
> gr_mute_cc_sptr
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ff.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <gr_mute_ff.h>
> #include <gr_io_signature.h>
> #include <string.h>
> +#include <cstring>
>
>
> gr_mute_ff_sptr
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ii.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <gr_mute_ii.h>
> #include <gr_io_signature.h>
> #include <string.h>
> +#include <cstring>
>
>
> gr_mute_ii_sptr
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ss.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <gr_mute_ss.h>
> #include <gr_io_signature.h>
> #include <string.h>
> +#include <cstring>
>
>
> gr_mute_ss_sptr
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t
> 2008-04-11 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <@address@hidden>
> #include <gr_io_signature.h>
> #include <string.h>
> +#include <cstring>
>
>
> @SPTR_NAME@
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
>
> #include <gr_peak_detector_fb.h>
> #include <gr_io_signature.h>
> +#include <cstring>
>
> gr_peak_detector_fb_sptr
> gr_make_peak_detector_fb (float threshold_factor_rise,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
>
> #include <gr_peak_detector_ib.h>
> #include <gr_io_signature.h>
> +#include <cstring>
>
> gr_peak_detector_ib_sptr
> gr_make_peak_detector_ib (float threshold_factor_rise,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
>
> #include <gr_peak_detector_sb.h>
> #include <gr_io_signature.h>
> +#include <cstring>
>
> gr_peak_detector_sb_sptr
> gr_make_peak_detector_sb (float threshold_factor_rise,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
> gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
>
> #include <@address@hidden>
> #include <gr_io_signature.h>
> +#include <cstring>
>
> @SPTR_NAME@
> address@hidden@ (float threshold_factor_rise,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -32,6 +32,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <stdexcept>
> +#include <stdio.h>
>
>
> gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -32,6 +32,8 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <stdexcept>
> +#include <stdio.h>
> +#include <string.h>
>
>
> gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_sink_base.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_sink_base.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <stdexcept>
> +#include <stdio.h>
>
> // win32 (mingw/msvc) specific
> #ifdef HAVE_IO_H
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_source.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_source.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_source.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_source.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -31,6 +31,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <stdexcept>
> +#include <stdio.h>
>
> // win32 (mingw/msvc) specific
> #ifdef HAVE_IO_H
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gri_logger.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gri_logger.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gri_logger.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gri_logger.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <stdarg.h>
> #include <stdexcept>
> #include <boost/weak_ptr.hpp>
> +#include <string.h>
>
>
> /*
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_sink.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_sink.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -32,6 +32,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <stdexcept>
> +#include <string.h>
>
>
> // public constructor that returns a shared_ptr
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_source.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_source.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_source.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_source.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -32,6 +32,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <stdexcept>
> +#include <string.h>
>
>
> // public constructor that returns a shared_ptr
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_sink.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <stdexcept>
> #if defined(HAVE_SOCKET)
> #include <netdb.h>
> +#include <stdio.h>
> typedef void* optval_t;
> #else
> #define SHUT_RDWR 2
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_source.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -27,6 +27,8 @@
> #include <gr_io_signature.h>
> #include <stdexcept>
> #include <errno.h>
> +#include <stdio.h>
> +#include <string.h>
> #if defined(HAVE_SOCKET)
> #include <netdb.h>
> typedef void* optval_t;
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/missing/getopt.c
> gnuradio-3.1.2/gnuradio-core/src/lib/missing/getopt.c
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/missing/getopt.c
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/missing/getopt.c 2008-04-11
> 19:57:23.000000000 +0200
> @@ -52,6 +52,7 @@
> #endif
>
> #include <stdio.h>
> +#include <string.h>
>
> /* Comment out all this code if we are using the GNU C Library, and are not
> actually compiling the library itself. This code is part of the GNU C
> @@ -179,6 +180,7 @@
> On some systems, it contains special magic macros that don't work
> in GCC. */
> #include <string.h>
> +#include <string.h>
> #define my_index strchr
> #define my_bcopy(src, dst, n) memcpy ((dst), (src), (n))
> #else
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c
> gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/decode_rs.c
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/decode_rs.c
> 2008-04-11 19:57:23.000000000 +0200
> @@ -8,6 +8,7 @@
> #endif
>
> #include <string.h>
> +#include <strings.h>
>
> #define NULL ((void *)0)
> #define min(a,b) ((a) < (b) ? (a) : (b))
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c
> gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/encode_rs.c
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/encode_rs.c
> 2008-04-11 19:57:23.000000000 +0200
> @@ -3,6 +3,7 @@
> * May be used under the terms of the GNU General Public License (GPL)
> */
> #include <string.h>
> +#include <strings.h>
>
> #ifdef FIXED
> #include "fixed.h"
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c
> gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/exercise.c
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/exercise.c
> 2008-04-11 19:57:23.000000000 +0200
> @@ -13,6 +13,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <strings.h>
>
> #ifdef FIXED
> #include "fixed.h"
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <gr_dispatcher.h>
> #include <math.h>
> #include <errno.h>
> +#include <stdio.h>
>
> #ifdef HAVE_SELECT
> # ifdef HAVE_SYS_SELECT_H
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_error_handler.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_error_handler.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -48,6 +48,7 @@
> #include <assert.h>
> #include <stdexcept>
> #include <unistd.h>
> +#include <stdio.h>
>
> #ifdef HAVE_IO_H
> #include <io.h>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <gr_local_sighandler.h>
> #include <stdexcept>
> #include <stdio.h>
> +#include <cstring>
>
>
> gr_local_sighandler::gr_local_sighandler (int signum,
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_message.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_message.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_message.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_message.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -25,6 +25,8 @@
> #endif
> #include <gr_message.h>
> #include <assert.h>
> +#include <cstring>
> +#include <string.h>
>
> static long s_ncurrently_allocated = 0;
>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_preferences.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_preferences.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -31,6 +31,7 @@
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
> +#include <cstring>
>
>
> #ifdef MKDIR_TAKES_ONE_ARG
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_realtime.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_realtime.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #endif
>
> #include <string.h>
> +#include <cstring>
> #include <errno.h>
> #include <stdio.h>
>
> @@ -61,6 +62,7 @@
> #elif defined(HAVE_PTHREAD_SETSCHEDPARAM)
>
> #include <pthread.h>
> +#include <stdio.h>
>
> gr_rt_status_t
> gr_enable_realtime_scheduling()
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <gr_scheduler_thread.h>
> #include <iostream>
> +#include <stdio.h>
>
> #ifdef HAVE_SIGNAL_H
> #include <signal.h>
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <stdexcept>
> #include <gr_preferences.h>
> #include <stdio.h>
> +#include <string.h>
> #include <gr_local_sighandler.h>
>
> // all the factories we know about
> diff -Naur
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
> gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
> ---
> gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -41,7 +41,6 @@
> #include <gr_pagesize.h>
> #include <gr_tmp_path.h>
>
> -
> gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size)
> : gr_vmcircbuf (size)
> {
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_nco.cc
> gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_nco.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_nco.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_nco.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <unistd.h>
> #include <gr_nco.h>
> #include <gr_fxpt_nco.h>
> +#include <cstring>
>
> #define ITERATIONS 20000000
> #define BLOCK_SIZE (10 * 1000) // fits in cache
> diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_vco.cc
> gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_vco.cc
> --- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_vco.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_vco.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <unistd.h>
> #include <gr_vco.h>
> #include <gr_fxpt_vco.h>
> +#include <cstring>
>
> #define ITERATIONS 5000000
> #define BLOCK_SIZE (10 * 1000) // fits in cache
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsc_bit_timing_loop.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <atsc_bit_timing_loop.h>
> #include <gr_io_signature.h>
> #include <atsc_consts.h>
> +#include <cstring>
>
> // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz
> float input_rate = 19.2e6;
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_checker_naive.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -25,6 +25,7 @@
> #include <atsci_pnXXX.h>
> #include <iostream>
> #include <cstring>
> +#include <cstring>
>
> using std::cerr;
> using std::endl;
> diff -Naur
> gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -25,6 +25,7 @@
> #include <atsci_pnXXX.h>
> #include <iostream>
> #include <cstring>
> +#include <cstring>
>
> using std::cerr;
> using std::endl;
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_reed_solomon.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -22,6 +22,8 @@
>
> #include <atsci_reed_solomon.h>
> #include <assert.h>
> +#include <cstring>
> +#include <string.h>
>
> extern "C" {
> #include "rs.h"
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_sliding_correlator.h
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-04-11
> 19:57:23.000000000 +0200
> @@ -19,11 +19,12 @@
> * the Free Software Foundation, Inc., 51 Franklin Street,
> * Boston, MA 02110-1301, USA.
> */
> +#include <string>
> +#include <string.h>
> +
> #ifndef _ATSC_SLIDING_CORRELATOR_H_
> #define _ATSC_SLIDING_CORRELATOR_H_
>
> -#include <string>
> -
> extern const unsigned char atsc_pn511[511];
> extern const unsigned char atsc_pn63[63];
>
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sssr.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_sssr.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sssr.cc 2008-04-11
> 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_sssr.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <assert.h>
> #include <atsci_diag_output.h>
> #include <gr_math.h>
> +#include <stdio.h>
>
> /*
> * ----------------------------------------------------------------
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_trellis_encoder.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -23,6 +23,8 @@
> #include <atsci_trellis_encoder.h>
> #include <assert.h>
> #include <stdio.h>
> +#include <cstring>
> +#include <string.h>
>
> static const int DIBITS_PER_BYTE = 4;
>
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc
> gnuradio-3.1.2/gr-atsc/src/lib/atsci_viterbi_decoder.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -25,6 +25,8 @@
> #include <stdio.h>
> #include <cmath>
> #include "atsci_viterbi_mux.cc"
> +#include <cstring>
> +#include <string.h>
>
>
> /* How many separate Trellis encoders / Viterbi decoders run in parallel */
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_types.h
> gnuradio-3.1.2/gr-atsc/src/lib/atsc_types.h
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_types.h 2008-04-11
> 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/atsc_types.h 2008-04-11
> 19:57:23.000000000 +0200
> @@ -24,6 +24,7 @@
> #define _ATSC_TYPES_H_
>
> #include <atsc_consts.h>
> +#include <string.h>
> #include <cstring>
> #include <cassert>
>
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/interleaver_fifo.h
> gnuradio-3.1.2/gr-atsc/src/lib/interleaver_fifo.h
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/interleaver_fifo.h
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/interleaver_fifo.h 2008-04-11
> 19:57:23.000000000 +0200
> @@ -26,6 +26,7 @@
>
> #include <interleaver_fifo.h>
> #include <string.h>
> +#include <strings.h>
>
> /*!
> * \brief template class for interleaver fifo
> diff -Naur
> gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -22,6 +22,7 @@
>
> #include <cppunit/TestAssert.h>
> #include <qa_atsci_data_interleaver.h>
> +#include <cstring>
>
>
> /*!
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <cppunit/TestAssert.h>
> #include <assert.h>
> #include <iostream>
> +#include <cstring>
>
> using std::cerr;
> using std::endl;
> diff -Naur
> gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -29,6 +29,8 @@
> #include <atsci_fake_single_viterbi.h>
> #include <qa_atsci_fake_single_viterbi.h>
> #include <random.h>
> +#include <cstring>
> +#include <string.h>
>
>
> static const int NTRIALS = 50;
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_randomizer.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -23,6 +23,7 @@
> #include <qa_atsci_randomizer.h>
>
> #include <cppunit/TestAssert.h>
> +#include <cstring>
>
> static unsigned int expected_initial_states[] = {
> 0x018f,
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -29,6 +29,7 @@
> #include <stdio.h>
> #include <atsci_reed_solomon.h>
> #include <qa_atsci_reed_solomon.h>
> +#include <cstring>
>
>
> static const int NROOTS = 20;
> diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -30,6 +30,8 @@
> #include <atsci_single_viterbi.h>
> #include <qa_atsci_single_viterbi.h>
> #include <random.h>
> +#include <cstring>
> +#include <string.h>
>
>
> static const int NTRIALS = 50;
> diff -Naur
> gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include <string.h>
> #include <stdlib.h>
> #include <time.h>
> +#include <cstring>
>
> #define NELEM(x) (sizeof (x) / sizeof (x[0]))
>
> diff -Naur
> gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
> gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
> --- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -31,6 +31,7 @@
> #include <string.h>
> #include <stdlib.h>
> #include <time.h>
> +#include <cstring>
>
> #define NELEM(x) (sizeof (x) / sizeof (x[0]))
>
> diff -Naur
> gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc
> gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_sink.cc
> --- gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_sink.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -33,6 +33,8 @@
> #include <stdexcept>
> #include <gri_portaudio.h>
> #include <omnithread.h>
> +#include <cstring>
> +#include <string.h>
>
> #define LOGGING 0 // define to 0 or 1
>
> diff -Naur
> gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc
> gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_source.cc
> --- gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc
> 2008-04-11 19:56:47.000000000 +0200
> +++ gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_source.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -33,6 +33,8 @@
> #include <stdexcept>
> #include <gri_portaudio.h>
> #include <omnithread.h>
> +#include <cstring>
> +#include <string.h>
>
> #define LOGGING 0 // define to 0 or 1
>
> diff -Naur gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c
> gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/code.c
> --- gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-04-11
> 19:57:23.000000000 +0200
> @@ -19,6 +19,7 @@
> #include "private.h"
> #include "gsm.h"
> #include "proto.h"
> +#include <string.h>
>
> /*
> * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER
> diff -Naur gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
> gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
> --- gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-04-11
> 19:57:23.000000000 +0200
> @@ -30,6 +30,7 @@
> #include "gsm.h"
> #include "private.h"
> #include "proto.h"
> +#include <strings.h>
>
> gsm gsm_create P0()
> {
> diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.cc
> gnuradio-3.1.2/gr-trellis/src/lib/fsm.cc
> --- gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.cc 2008-04-11
> 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-trellis/src/lib/fsm.cc 2008-04-11 19:57:23.000000000
> +0200
> @@ -26,6 +26,7 @@
> #include <fstream>
> #include <stdexcept>
> #include <cmath>
> +#include <stdlib.h>
> #include "base.h"
> #include "fsm.h"
>
> diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.h
> gnuradio-3.1.2/gr-trellis/src/lib/fsm.h
> --- gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.h 2008-04-11
> 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-trellis/src/lib/fsm.h 2008-04-11 19:57:23.000000000
> +0200
> @@ -24,6 +24,7 @@
> #define INCLUDED_TRELLIS_FSM_H
>
> #include <vector>
> +#include <iosfwd>
>
> /*!
> * \brief FSM class
> diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/trellis_permutation.cc
> gnuradio-3.1.2/gr-trellis/src/lib/trellis_permutation.cc
> --- gnuradio-3.1.2-upstream/gr-trellis/src/lib/trellis_permutation.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-trellis/src/lib/trellis_permutation.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <trellis_permutation.h>
> #include <gr_io_signature.h>
> #include <iostream>
> +#include <string.h>
>
> trellis_permutation_sptr
> trellis_make_permutation (int K, const std::vector<int> &TABLE, int
> SYMS_PER_BLOCK, size_t NBYTES_INOUT)
> diff -Naur gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_s.cc
> gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_s.cc
> --- gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_s.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_s.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -35,6 +35,7 @@
> #include <stdio.h>
> #include <iostream>
> #include <stdexcept>
> +#include <cstring>
>
>
>
> diff -Naur gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc
> gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_uc.cc
> --- gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -35,6 +35,8 @@
> #include <stdio.h>
> #include <iostream>
> #include <stdexcept>
> +#include <cstring>
> +#include <string.h>
>
>
>
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_rx.cc
> gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_rx.cc
> --- gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_rx.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_rx.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <cstring>
> #include <unistd.h>
> #include <usb.h> /* needed for usb functions */
> #include <getopt.h>
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_tx.cc
> gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_tx.cc
> --- gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_tx.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_tx.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -27,6 +27,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <cstring>
> #include <unistd.h>
> #include <usb.h> /* needed for usb functions */
> #include <getopt.h>
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/usrper.cc
> gnuradio-3.1.2/usrp/host/apps/usrper.cc
> --- gnuradio-3.1.2-upstream/usrp/host/apps/usrper.cc 2008-04-11
> 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/apps/usrper.cc 2008-04-11 19:57:23.000000000
> +0200
> @@ -30,6 +30,7 @@
>
> #include "usrp_prims.h"
> #include "usrp_spi_defs.h"
> +#include <cstring>
>
> char *prog_name;
>
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_linux.cc
> gnuradio-3.1.2/usrp/host/lib/legacy/fusb_linux.cc
> --- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_linux.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/lib/legacy/fusb_linux.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -36,7 +36,7 @@
> #include <string.h>
> #include <algorithm>
> #include <errno.h>
> -#include <string.h>
> +#include <cstring>
>
> #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1
>
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_win32.cc
> gnuradio-3.1.2/usrp/host/lib/legacy/fusb_win32.cc
> --- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_win32.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/lib/legacy/fusb_win32.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -28,6 +28,7 @@
> #include <usb.h>
> #include <assert.h>
> #include <stdexcept>
> +#include <string.h>
>
> static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size();
> static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE;
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_basic.cc
> gnuradio-3.1.2/usrp/host/lib/legacy/usrp_basic.cc
> --- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_basic.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_basic.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -34,6 +34,7 @@
> #include <assert.h>
> #include <math.h>
> #include <ad9862.h>
> +#include <cstring>
>
> using namespace ad9862;
>
> diff -Naur
> gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc
> gnuradio-3.1.2/usrp/host/lib/legacy/usrp_local_sighandler.cc
> --- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_local_sighandler.cc
> 2008-04-11 19:57:23.000000000 +0200
> @@ -32,6 +32,7 @@
> #include <usrp_local_sighandler.h>
> #include <stdexcept>
> #include <stdio.h>
> +#include <cstring>
>
> usrp_local_sighandler::usrp_local_sighandler (int signum,
> void (*new_handler)(int))
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_prims.cc
> gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc
> --- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_prims.cc
> 2008-04-11 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc 2008-04-11
> 19:57:23.000000000 +0200
> @@ -36,6 +36,7 @@
> #include <unistd.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <cstring>
> #include <ctype.h>
> #include <time.h> // FIXME should check with autoconf (nanosleep)
> #include <algorithm>
> @@ -62,6 +63,7 @@
> static char *default_fpga_filename = "std_2rxhb_2tx.rbf";
>
> #include "std_paths.h"
> +#include <stdio.h>
>
> static char *
> find_file (const char *filename, int hw_rev)
> diff -Naur gnuradio-3.1.2-upstream/usrp/host/misc/getopt.c
> gnuradio-3.1.2/usrp/host/misc/getopt.c
> --- gnuradio-3.1.2-upstream/usrp/host/misc/getopt.c 2008-04-11
> 19:56:46.000000000 +0200
> +++ gnuradio-3.1.2/usrp/host/misc/getopt.c 2008-04-11 19:57:23.000000000
> +0200
> @@ -52,6 +52,7 @@
> #endif
>
> #include <stdio.h>
> +#include <string.h>
>
> /* Comment out all this code if we are using the GNU C Library, and are not
> actually compiling the library itself. This code is part of the GNU C
> 2008-03-04 Marek Mahut <address@hidden>
>
> * gnuradio-3.1.2-gcc34.patch: fixes build problems under gcc 3.4
>
>