On Thu, Feb 16, 2006 at 07:17:08PM -0800, Eric Blossom wrote:
> On Wed, Feb 15, 2006 at 04:28:48AM +0100, Martin Dvh wrote:
> > I am creating a block which needs an unsigned 64 bit int (uint64) in a
> > struct
> > I want to do this in a cross-platform way but there is no gr_uint64 yet.
> > I can just use unsigned long long int, but I am not sure this is save
> > (allways 64 bit)
> > I can include stdint.h and use uint64_t, but I don't know if this is
> > available on every system
> >
> > The existing gr_types.h file does the following for the current types:
> > typedef short gr_int16;
> > typedef int gr_int32;
> > typedef unsigned short gr_uint16;
> > typedef unsigned int gr_uint32;
> >
> > I am not sure this is save too.
> >
> > So how to proceed?
> >
> > Greetings,
> > Martin
>
> Hi Martin,
>
> I added gr_int64 and gr_uint64 to gr_types.h.
> I continued the "unsafe practice" pending a proper config fix.
Tedious is the word for the pending fix :-)
Please find a patch attached. It has autoconf detection of stdint.h,
definitions of types accordingly in gr_types.h and a bunch of #include
<config.h> in the C++ sources files since config.h can not easily be
included from header files (multiple inclusion not handled properly).
This was the opportunity to shoot couple of mistakes in the form
#ifndef HAVE_CONFIG_H
#include <config.h>
#endif
--
Stephane
diff -u -b -B -w -p -r1.41 configure.ac
--- configure.ac 10 Dec 2005 02:03:54 -0000 1.41
+++ configure.ac 17 Feb 2006 10:18:23 -0000
@@ -81,7 +81,7 @@ AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h
unistd.h)
AC_CHECK_HEADERS(linux/ppdev.h sys/mman.h sys/select.h sys/types.h)
-AC_CHECK_HEADERS(sys/resource.h)
+AC_CHECK_HEADERS(sys/resource.h stdint.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
Index: src/lib/runtime/gr_types.h
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/runtime/gr_types.h,v
retrieving revision 1.4
diff -u -b -B -w -p -r1.4 gr_types.h
--- src/lib/runtime/gr_types.h 17 Feb 2006 03:14:11 -0000 1.4
+++ src/lib/runtime/gr_types.h 17 Feb 2006 10:25:49 -0000
@@ -35,11 +35,29 @@ typedef std::vector<double> gr_vector_
typedef std::vector<void *> gr_vector_void_star;
typedef std::vector<const void *> gr_vector_const_void_star;
+/*
+ * #include <config.h> must be placed beforehand
+ * in the source file including gr_types.h for
+ * the following to work correctly
+ */
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+typedef int16_t gr_int16;
+typedef int32_t gr_int32;
+typedef int64_t gr_int64;
+typedef uint16_t gr_uint16;
+typedef uint32_t gr_uint32;
+typedef uint64_t gr_uint64;
+#else
+/*
+ * Note: these defaults may be wrong on 64-bit systems
+ */
typedef short gr_int16;
typedef int gr_int32;
typedef long long gr_int64;
typedef unsigned short gr_uint16;
typedef unsigned int gr_uint32;
typedef unsigned long long gr_uint64;
+#endif /* HAVE_STDINT_H */
#endif /* INCLUDED_GR_TYPES_H */
diff -u -b -B -w -p -r1.1 ccomplex_dotprod_generic.cc
--- src/lib/filter/ccomplex_dotprod_generic.cc 9 Nov 2004 00:29:51 -0000
1.1
+++ src/lib/filter/ccomplex_dotprod_generic.cc 17 Feb 2006 10:18:25 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_complex.h>
#include "gr_fir_ccc_simd.h"
#include "ccomplex_dotprod_generic.h"
diff -u -b -B -w -p -r1.2 complex_dotprod_generic.cc
--- src/lib/filter/complex_dotprod_generic.cc 9 Nov 2004 00:29:51 -0000
1.2
+++ src/lib/filter/complex_dotprod_generic.cc 17 Feb 2006 10:18:25 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_complex.h>
#include "gr_fir_scc_simd.h"
#include "complex_dotprod_generic.h"
Index: src/lib/filter/generate_gr_fir_sysconfig.py
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig.py,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 generate_gr_fir_sysconfig.py
--- src/lib/filter/generate_gr_fir_sysconfig.py 10 Apr 2004 18:00:17 -0000
1.1.1.1
+++ src/lib/filter/generate_gr_fir_sysconfig.py 17 Feb 2006 10:18:26 -0000
@@ -105,6 +105,9 @@ def make_gr_fir_sysconfig_cc ():
* Any changes made to this file will be overwritten.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_sysconfig.h>
gr_fir_sysconfig::~gr_fir_sysconfig ()
Index: src/lib/filter/generate_gr_fir_sysconfig_generic.py
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig_generic.py,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 generate_gr_fir_sysconfig_generic.py
--- src/lib/filter/generate_gr_fir_sysconfig_generic.py 10 Apr 2004 18:00:17
-0000 1.1.1.1
+++ src/lib/filter/generate_gr_fir_sysconfig_generic.py 17 Feb 2006 10:18:26
-0000
@@ -121,6 +121,9 @@ def make_gr_fir_sysconfig_generic_cc ():
* Any changes made to this file will be overwritten.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_sysconfig_generic.h>
''')
Index: src/lib/filter/generate_gr_fir_util.py
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/generate_gr_fir_util.py,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 generate_gr_fir_util.py
--- src/lib/filter/generate_gr_fir_util.py 10 Apr 2004 18:00:17 -0000
1.1.1.1
+++ src/lib/filter/generate_gr_fir_util.py 17 Feb 2006 10:18:27 -0000
@@ -145,6 +145,9 @@ def make_gr_fir_util_cc ():
out.write (copyright)
out.write ('''
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_util.h>
#include <gr_fir_sysconfig.h>
Index: src/lib/filter/gr_fir_XXX.cc.t
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_XXX.cc.t,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 gr_fir_XXX.cc.t
--- src/lib/filter/gr_fir_XXX.cc.t 10 Apr 2004 18:00:17 -0000 1.1.1.1
+++ src/lib/filter/gr_fir_XXX.cc.t 17 Feb 2006 10:18:27 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <@[EMAIL PROTECTED]>
@FIR_TYPE@::[EMAIL PROTECTED]@ ()
Index: src/lib/filter/gr_fir_XXX_generic.cc.t
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_XXX_generic.cc.t,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 gr_fir_XXX_generic.cc.t
--- src/lib/filter/gr_fir_XXX_generic.cc.t 10 Apr 2004 18:00:17 -0000
1.1.1.1
+++ src/lib/filter/gr_fir_XXX_generic.cc.t 17 Feb 2006 10:18:30 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <@[EMAIL PROTECTED]>
#if (@N_UNROLL@ == 4)
Index: src/lib/filter/gr_fir_ccc_simd.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_ccc_simd.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_fir_ccc_simd.cc
--- src/lib/filter/gr_fir_ccc_simd.cc 15 Jul 2005 19:44:32 -0000 1.2
+++ src/lib/filter/gr_fir_ccc_simd.cc 17 Feb 2006 10:18:30 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_ccc_simd.h>
#include <assert.h>
Index: src/lib/filter/gr_fir_ccc_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_ccc_x86.cc,v
retrieving revision 1.1
diff -u -b -B -w -p -r1.1 gr_fir_ccc_x86.cc
--- src/lib/filter/gr_fir_ccc_x86.cc 9 Nov 2004 00:29:51 -0000 1.1
+++ src/lib/filter/gr_fir_ccc_x86.cc 17 Feb 2006 10:18:30 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_ccc_x86.h>
#include <ccomplex_dotprod_x86.h>
Index: src/lib/filter/gr_fir_ccf_simd.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_ccf_simd.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_fir_ccf_simd.cc
--- src/lib/filter/gr_fir_ccf_simd.cc 15 Jul 2005 19:44:32 -0000 1.2
+++ src/lib/filter/gr_fir_ccf_simd.cc 17 Feb 2006 10:18:30 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_ccf_simd.h>
#include <assert.h>
Index: src/lib/filter/gr_fir_ccf_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_ccf_x86.cc,v
retrieving revision 1.1
diff -u -b -B -w -p -r1.1 gr_fir_ccf_x86.cc
--- src/lib/filter/gr_fir_ccf_x86.cc 10 May 2005 01:29:17 -0000 1.1
+++ src/lib/filter/gr_fir_ccf_x86.cc 17 Feb 2006 10:18:30 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_ccf_x86.h>
#include <fcomplex_dotprod_x86.h>
Index: src/lib/filter/gr_fir_fcc_simd.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_fcc_simd.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_fir_fcc_simd.cc
--- src/lib/filter/gr_fir_fcc_simd.cc 15 Jul 2005 19:44:32 -0000 1.2
+++ src/lib/filter/gr_fir_fcc_simd.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_fcc_simd.h>
#include <assert.h>
Index: src/lib/filter/gr_fir_fcc_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.cc,v
retrieving revision 1.1
diff -u -b -B -w -p -r1.1 gr_fir_fcc_x86.cc
--- src/lib/filter/gr_fir_fcc_x86.cc 10 May 2005 01:29:17 -0000 1.1
+++ src/lib/filter/gr_fir_fcc_x86.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_fcc_x86.h>
#include <fcomplex_dotprod_x86.h>
Index: src/lib/filter/gr_fir_fff_simd.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_fff_simd.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_fir_fff_simd.cc
--- src/lib/filter/gr_fir_fff_simd.cc 15 Jul 2005 19:44:32 -0000 1.2
+++ src/lib/filter/gr_fir_fff_simd.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_fff_simd.h>
#include <assert.h>
Index: src/lib/filter/gr_fir_fff_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_fff_x86.cc,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 gr_fir_fff_x86.cc
--- src/lib/filter/gr_fir_fff_x86.cc 10 Apr 2004 18:00:18 -0000 1.1.1.1
+++ src/lib/filter/gr_fir_fff_x86.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_fff_x86.h>
#include <float_dotprod_x86.h>
Index: src/lib/filter/gr_fir_fsf_simd.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_fsf_simd.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_fir_fsf_simd.cc
--- src/lib/filter/gr_fir_fsf_simd.cc 15 Jul 2005 19:44:32 -0000 1.2
+++ src/lib/filter/gr_fir_fsf_simd.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_fsf_simd.h>
#include <assert.h>
Index: src/lib/filter/gr_fir_fsf_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_fsf_x86.cc,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 gr_fir_fsf_x86.cc
--- src/lib/filter/gr_fir_fsf_x86.cc 10 Apr 2004 18:00:18 -0000 1.1.1.1
+++ src/lib/filter/gr_fir_fsf_x86.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_fsf_x86.h>
#include <float_dotprod_x86.h>
Index: src/lib/filter/gr_fir_scc_simd.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_scc_simd.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_fir_scc_simd.cc
--- src/lib/filter/gr_fir_scc_simd.cc 15 Jul 2005 19:44:32 -0000 1.2
+++ src/lib/filter/gr_fir_scc_simd.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_scc_simd.h>
#include <assert.h>
Index: src/lib/filter/gr_fir_scc_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_scc_x86.cc,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 gr_fir_scc_x86.cc
--- src/lib/filter/gr_fir_scc_x86.cc 10 Apr 2004 18:00:19 -0000 1.1.1.1
+++ src/lib/filter/gr_fir_scc_x86.cc 17 Feb 2006 10:18:31 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_scc_x86.h>
#include <complex_dotprod_x86.h>
Index: src/lib/filter/gr_fir_sysconfig_x86.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc,v
retrieving revision 1.3
diff -u -b -B -w -p -r1.3 gr_fir_sysconfig_x86.cc
--- src/lib/filter/gr_fir_sysconfig_x86.cc 10 May 2005 01:11:33 -0000
1.3
+++ src/lib/filter/gr_fir_sysconfig_x86.cc 17 Feb 2006 10:18:32 -0000
@@ -19,6 +19,9 @@
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_sysconfig_x86.h>
#include <gr_cpu.h>
Index: src/lib/filter/gri_mmse_fir_interpolator.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gri_mmse_fir_interpolator.cc
--- src/lib/filter/gri_mmse_fir_interpolator.cc 17 Nov 2005 06:51:31 -0000
1.2
+++ src/lib/filter/gri_mmse_fir_interpolator.cc 17 Feb 2006 10:18:33 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gri_mmse_fir_interpolator.h>
#include <gr_fir_util.h>
#include <gr_fir_fff.h>
Index: src/lib/filter/gri_mmse_fir_interpolator_cc.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator_cc.cc,v
retrieving revision 1.1
diff -u -b -B -w -p -r1.1 gri_mmse_fir_interpolator_cc.cc
--- src/lib/filter/gri_mmse_fir_interpolator_cc.cc 12 Nov 2005 05:25:50
-0000 1.1
+++ src/lib/filter/gri_mmse_fir_interpolator_cc.cc 17 Feb 2006 10:18:33
-0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gri_mmse_fir_interpolator_cc.h>
#include <gr_fir_util.h>
#include <gr_fir_ccf.h>
Index: src/lib/filter/sysconfig_x86.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/filter/sysconfig_x86.cc,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 sysconfig_x86.cc
--- src/lib/filter/sysconfig_x86.cc 10 Apr 2004 18:00:23 -0000 1.1.1.1
+++ src/lib/filter/sysconfig_x86.cc 17 Feb 2006 10:18:33 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_fir_sysconfig_x86.h>
gr_fir_sysconfig *
Index: src/lib/general/gr_align_on_samplenumbers_ss.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc,v
retrieving revision 1.4
diff -u -b -B -w -p -r1.4 gr_align_on_samplenumbers_ss.cc
--- src/lib/general/gr_align_on_samplenumbers_ss.cc 20 Dec 2005 22:11:13
-0000 1.4
+++ src/lib/general/gr_align_on_samplenumbers_ss.cc 17 Feb 2006 10:18:36
-0000
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/lib/general/gr_crc32.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_crc32.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_crc32.cc
--- src/lib/general/gr_crc32.cc 10 Nov 2005 23:08:58 -0000 1.2
+++ src/lib/general/gr_crc32.cc 17 Feb 2006 10:18:36 -0000
@@ -24,6 +24,9 @@
* See also ISO 3309 [ISO-3309] or ITU-T V.42 [ITU-V42] for a formal
specification.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_crc32.h>
Index: src/lib/general/gr_head.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_head.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_head.cc
--- src/lib/general/gr_head.cc 4 Jul 2004 22:07:21 -0000 1.2
+++ src/lib/general/gr_head.cc 17 Feb 2006 10:18:36 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_head.h>
#include <gr_io_signature.h>
Index: src/lib/general/gr_lfsr_32k_source_s.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_lfsr_32k_source_s.cc
--- src/lib/general/gr_lfsr_32k_source_s.cc 5 Jan 2005 23:29:38 -0000
1.2
+++ src/lib/general/gr_lfsr_32k_source_s.cc 17 Feb 2006 10:18:37 -0000
@@ -21,6 +21,9 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_lfsr_32k_source_s.h>
#include <gr_io_signature.h>
#include <stdexcept>
Index: src/lib/general/gr_noise_source_X.cc.t
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/general/gr_noise_source_X.cc.t,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_noise_source_X.cc.t
--- src/lib/general/gr_noise_source_X.cc.t 4 Jul 2004 22:07:21 -0000
1.2
+++ src/lib/general/gr_noise_source_X.cc.t 17 Feb 2006 10:18:37 -0000
@@ -22,6 +22,9 @@
// @WARNING@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <@[EMAIL PROTECTED]>
#include <gr_io_signature.h>
#include <stdexcept>
Index: src/lib/general/gr_nop.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_nop.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_nop.cc
--- src/lib/general/gr_nop.cc 4 Jul 2004 22:56:47 -0000 1.2
+++ src/lib/general/gr_nop.cc 17 Feb 2006 10:18:37 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_nop.h>
#include <gr_io_signature.h>
Index: src/lib/general/gr_reverse.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_reverse.cc,v
retrieving revision 1.1
diff -u -b -B -w -p -r1.1 gr_reverse.cc
--- src/lib/general/gr_reverse.cc 15 Jul 2005 19:49:00 -0000 1.1
+++ src/lib/general/gr_reverse.cc 17 Feb 2006 10:18:38 -0000
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/lib/general/gr_sig_source_X.cc.t
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_sig_source_X.cc.t,v
retrieving revision 1.8
diff -u -b -B -w -p -r1.8 gr_sig_source_X.cc.t
--- src/lib/general/gr_sig_source_X.cc.t 18 Oct 2005 03:04:23 -0000
1.8
+++ src/lib/general/gr_sig_source_X.cc.t 17 Feb 2006 10:18:38 -0000
@@ -22,6 +22,9 @@
// @WARNING@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <@[EMAIL PROTECTED]>
#include <algorithm>
#include <gr_io_signature.h>
Index: src/lib/general/gr_simple_correlator.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/general/gr_simple_correlator.cc,v
retrieving revision 1.16
diff -u -b -B -w -p -r1.16 gr_simple_correlator.cc
--- src/lib/general/gr_simple_correlator.cc 1 Dec 2005 22:14:22 -0000
1.16
+++ src/lib/general/gr_simple_correlator.cc 17 Feb 2006 10:18:40 -0000
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/lib/general/gr_simple_framer.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_simple_framer.cc,v
retrieving revision 1.6
diff -u -b -B -w -p -r1.6 gr_simple_framer.cc
--- src/lib/general/gr_simple_framer.cc 19 Aug 2005 01:43:33 -0000 1.6
+++ src/lib/general/gr_simple_framer.cc 17 Feb 2006 10:18:43 -0000
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: src/lib/general/gr_skiphead.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_skiphead.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_skiphead.cc
--- src/lib/general/gr_skiphead.cc 26 Dec 2005 23:32:18 -0000 1.2
+++ src/lib/general/gr_skiphead.cc 17 Feb 2006 10:18:43 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_skiphead.h>
#include <gr_io_signature.h>
Index: src/lib/general/gr_vco_f.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/gr_vco_f.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_vco_f.cc
Index: src/lib/general/gr_vector_sink_X.cc.t
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/general/gr_vector_sink_X.cc.t,v
retrieving revision 1.3
diff -u -b -B -w -p -r1.3 gr_vector_sink_X.cc.t
--- src/lib/general/gr_vector_sink_X.cc.t 4 Jul 2004 22:56:47 -0000
1.3
+++ src/lib/general/gr_vector_sink_X.cc.t 17 Feb 2006 10:18:43 -0000
@@ -22,6 +22,9 @@
// @WARNING@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <@[EMAIL PROTECTED]>
#include <algorithm>
#include <gr_io_signature.h>
Index: src/lib/general/gr_vector_source_X.cc.t
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/general/gr_vector_source_X.cc.t,v
retrieving revision 1.7
diff -u -b -B -w -p -r1.7 gr_vector_source_X.cc.t
--- src/lib/general/gr_vector_source_X.cc.t 10 Oct 2005 20:20:51 -0000
1.7
+++ src/lib/general/gr_vector_source_X.cc.t 17 Feb 2006 10:18:43 -0000
@@ -22,6 +22,9 @@
// @WARNING@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <@[EMAIL PROTECTED]>
#include <algorithm>
#include <gr_io_signature.h>
Index: src/lib/general/qa_gr_fxpt.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/qa_gr_fxpt.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 qa_gr_fxpt.cc
--- src/lib/general/qa_gr_fxpt.cc 22 Dec 2004 19:37:08 -0000 1.2
+++ src/lib/general/qa_gr_fxpt.cc 17 Feb 2006 10:18:43 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <qa_gr_fxpt.h>
#include <gr_fxpt.h>
#include <cppunit/TestAssert.h>
Index: src/lib/general/qa_gr_fxpt_nco.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/qa_gr_fxpt_nco.cc,v
retrieving revision 1.3
diff -u -b -B -w -p -r1.3 qa_gr_fxpt_nco.cc
--- src/lib/general/qa_gr_fxpt_nco.cc 10 Oct 2005 20:20:51 -0000 1.3
+++ src/lib/general/qa_gr_fxpt_nco.cc 17 Feb 2006 10:18:43 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <qa_gr_fxpt_nco.h>
#include <gr_fxpt_nco.h>
#include <gr_nco.h>
Index: src/lib/general/qa_gr_fxpt_vco.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc,v
retrieving revision 1.1
diff -u -b -B -w -p -r1.1 qa_gr_fxpt_vco.cc
--- src/lib/general/qa_gr_fxpt_vco.cc 18 Oct 2005 03:04:23 -0000 1.1
+++ src/lib/general/qa_gr_fxpt_vco.cc 17 Feb 2006 10:18:43 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <qa_gr_fxpt_vco.h>
#include <gr_fxpt_vco.h>
#include <gr_vco.h>
Index: src/lib/io/gr_oscope_guts.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/io/gr_oscope_guts.cc,v
retrieving revision 1.5
diff -u -b -B -w -p -r1.5 gr_oscope_guts.cc
--- src/lib/io/gr_oscope_guts.cc 16 Nov 2005 05:48:04 -0000 1.5
+++ src/lib/io/gr_oscope_guts.cc 17 Feb 2006 10:18:43 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_oscope_guts.h>
#include <stdexcept>
#include <stdio.h>
Index: src/lib/runtime/gr_io_signature.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/runtime/gr_io_signature.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 gr_io_signature.cc
--- src/lib/runtime/gr_io_signature.cc 19 Oct 2004 03:04:42 -0000 1.2
+++ src/lib/runtime/gr_io_signature.cc 17 Feb 2006 10:18:44 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <gr_io_signature.h>
#include <stdexcept>
#include <iostream>
Index: src/lib/runtime/qa_gr_block.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/runtime/qa_gr_block.cc,v
retrieving revision 1.1.1.1
diff -u -b -B -w -p -r1.1.1.1 qa_gr_block.cc
--- src/lib/runtime/qa_gr_block.cc 10 Apr 2004 18:00:56 -0000 1.1.1.1
+++ src/lib/runtime/qa_gr_block.cc 17 Feb 2006 10:18:45 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <qa_gr_block.h>
#include <gr_block.h>
#include <gr_runtime.h>
Index: src/lib/runtime/qa_gr_buffer.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/runtime/qa_gr_buffer.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 qa_gr_buffer.cc
--- src/lib/runtime/qa_gr_buffer.cc 18 Nov 2005 20:31:41 -0000 1.2
+++ src/lib/runtime/qa_gr_buffer.cc 17 Feb 2006 10:18:46 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <qa_gr_buffer.h>
#include <gr_buffer.h>
#include <cppunit/TestAssert.h>
Index: src/lib/runtime/qa_gr_io_signature.cc
===================================================================
RCS file:
/sources/gnuradio/gnuradio-core/src/lib/runtime/qa_gr_io_signature.cc,v
retrieving revision 1.2
diff -u -b -B -w -p -r1.2 qa_gr_io_signature.cc
--- src/lib/runtime/qa_gr_io_signature.cc 19 Oct 2004 03:04:42 -0000
1.2
+++ src/lib/runtime/qa_gr_io_signature.cc 17 Feb 2006 10:18:46 -0000
@@ -20,6 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <qa_gr_io_signature.h>
#include <gr_io_signature.h>
_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/discuss-gnuradio
