diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-04-30 02:24:06 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-04-30 02:24:06 +0000 |
| commit | 38ea3a576a20820e574c6cb37607aeafe07f34b4 (patch) | |
| tree | f606c6f72729860c68915920a71fa2fa97a0b945 /gr-atsc | |
| parent | d8e2641775a0ceb4fa388c59968a75509250d923 (diff) | |
Tweaks for gcc 4.3 based on patch from Marek Mahut <mmahut@fedoraproject.org>.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8292 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/lib/atsc_bit_timing_loop.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_reed_solomon.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_sliding_correlator.h | 5 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_sssr.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_trellis_encoder.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_viterbi_decoder.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/interleaver_fifo.h | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_data_interleaver.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_equalizer_nop.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_randomizer.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_reed_solomon.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_single_viterbi.cc | 1 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_trellis_encoder.cc | 1 |
14 files changed, 16 insertions, 2 deletions
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc index d0fc5bcc15..dbd864be5e 100644 --- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc @@ -27,6 +27,7 @@ #include <atsc_bit_timing_loop.h> #include <gr_io_signature.h> #include <atsc_consts.h> +#include <string.h> // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz float input_rate = 19.2e6; diff --git a/gr-atsc/src/lib/atsci_reed_solomon.cc b/gr-atsc/src/lib/atsci_reed_solomon.cc index 24645b0f65..e20e76d713 100644 --- a/gr-atsc/src/lib/atsci_reed_solomon.cc +++ b/gr-atsc/src/lib/atsci_reed_solomon.cc @@ -22,6 +22,7 @@ #include <atsci_reed_solomon.h> #include <assert.h> +#include <string.h> extern "C" { #include "rs.h" diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.h b/gr-atsc/src/lib/atsci_sliding_correlator.h index 66c49e574f..d6efd34098 100644 --- a/gr-atsc/src/lib/atsci_sliding_correlator.h +++ b/gr-atsc/src/lib/atsci_sliding_correlator.h @@ -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 --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc index 690647e1a7..e3f82547ba 100644 --- a/gr-atsc/src/lib/atsci_sssr.cc +++ b/gr-atsc/src/lib/atsci_sssr.cc @@ -27,6 +27,7 @@ #include <assert.h> #include <atsci_diag_output.h> #include <gr_math.h> +#include <stdio.h> /* * ---------------------------------------------------------------- diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.cc b/gr-atsc/src/lib/atsci_trellis_encoder.cc index b3bfb84d64..2ebccc371d 100644 --- a/gr-atsc/src/lib/atsci_trellis_encoder.cc +++ b/gr-atsc/src/lib/atsci_trellis_encoder.cc @@ -23,6 +23,7 @@ #include <atsci_trellis_encoder.h> #include <assert.h> #include <stdio.h> +#include <string.h> static const int DIBITS_PER_BYTE = 4; diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.cc b/gr-atsc/src/lib/atsci_viterbi_decoder.cc index 66d0189a80..5b9ae4e10a 100644 --- a/gr-atsc/src/lib/atsci_viterbi_decoder.cc +++ b/gr-atsc/src/lib/atsci_viterbi_decoder.cc @@ -25,6 +25,7 @@ #include <stdio.h> #include <cmath> #include "atsci_viterbi_mux.cc" +#include <string.h> /* How many separate Trellis encoders / Viterbi decoders run in parallel */ diff --git a/gr-atsc/src/lib/interleaver_fifo.h b/gr-atsc/src/lib/interleaver_fifo.h index 6d1a445806..98764af49e 100644 --- a/gr-atsc/src/lib/interleaver_fifo.h +++ b/gr-atsc/src/lib/interleaver_fifo.h @@ -26,6 +26,7 @@ #include <interleaver_fifo.h> #include <string.h> +#include <strings.h> /*! * \brief template class for interleaver fifo diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc index 63a9e0a641..e76a2f1f50 100644 --- a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +++ b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc @@ -22,6 +22,7 @@ #include <cppunit/TestAssert.h> #include <qa_atsci_data_interleaver.h> +#include <string.h> /*! diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc index e7a041ba0e..85584f55f0 100644 --- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc +++ b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc @@ -28,6 +28,7 @@ #include <cppunit/TestAssert.h> #include <assert.h> #include <iostream> +#include <string.h> using std::cerr; using std::endl; diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc index 98cb9a0a0c..f50f3b6b8c 100644 --- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc +++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc @@ -29,6 +29,7 @@ #include <atsci_fake_single_viterbi.h> #include <qa_atsci_fake_single_viterbi.h> #include <random.h> +#include <string.h> static const int NTRIALS = 50; diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.cc b/gr-atsc/src/lib/qa_atsci_randomizer.cc index d4f7d19ddb..b2d0bde8ab 100644 --- a/gr-atsc/src/lib/qa_atsci_randomizer.cc +++ b/gr-atsc/src/lib/qa_atsci_randomizer.cc @@ -23,6 +23,7 @@ #include <qa_atsci_randomizer.h> #include <cppunit/TestAssert.h> +#include <string.h> static unsigned int expected_initial_states[] = { 0x018f, diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc index 58cce0457f..b08c8af52a 100644 --- a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc +++ b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc @@ -29,6 +29,7 @@ #include <stdio.h> #include <atsci_reed_solomon.h> #include <qa_atsci_reed_solomon.h> +#include <string.h> static const int NROOTS = 20; diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc index 36e9592b7b..d7c29097e9 100644 --- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc +++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc @@ -30,6 +30,7 @@ #include <atsci_single_viterbi.h> #include <qa_atsci_single_viterbi.h> #include <random.h> +#include <string.h> static const int NTRIALS = 50; diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc index bfb2d6872a..390776e823 100644 --- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc +++ b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc @@ -30,6 +30,7 @@ #include <string.h> #include <stdlib.h> #include <time.h> +#include <string.h> #define NELEM(x) (sizeof (x) / sizeof (x[0])) |