From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Tue, 30 Jan 2007 03:59:34 +0000 (+0000)
Subject: Fixes ticket:134.  Unlikely offender was inclusion of
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4d84dd43e1dd5056a49b6c8d4caa638ece7a6cff;p=debian%2Fgnuradio

Fixes ticket:134.  Unlikely offender was inclusion of
gr_udp_sink/source code io.i.  omnithread.h was also including
<config.h> which is a no-no.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4333 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/config/gr_omnithread.m4 b/config/gr_omnithread.m4
index bdf1ecea..1c1ef699 100644
--- a/config/gr_omnithread.m4
+++ b/config/gr_omnithread.m4
@@ -1,6 +1,6 @@
 # Check for Omnithread (pthread/NT) thread support.             -*- Autoconf -*-
 
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2003,2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ AC_DEFUN([GR_OMNITHREAD],
   # Check first for POSIX
   ACX_PTHREAD(
   [ ot_posix="yes"
-    AC_DEFINE(OMNITHREAD_POSIX,[1],[Define to 1 to enable pthread])
+    DEFINES="$DEFINES -DOMNITHREAD_POSIX=1"
   ],[
     # If no POSIX support found, then check for NT threads
     AC_MSG_CHECKING([for NT threads])
@@ -34,7 +34,7 @@ AC_DEFUN([GR_OMNITHREAD],
       ],
       [ 
         ot_nt="yes"
-	AC_DEFINE(OMNITHREAD_NT,[1],[Define to 1 to enable NT thread])
+        DEFINES="$DEFINES -DOMNITHREAD_NT=1"
       ],
       [AC_MSG_FAILURE([GNU Radio requires POSIX threads.  pthreads not found.])]
     )
diff --git a/configure.ac b/configure.ac
index 7fc963c3..d934c5c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,9 @@ AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE(gnuradio,3.0svn)
 AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
 
+DEFINES=""
+AC_SUBST(DEFINES)
+
 dnl Remember if the user explicity set CXXFLAGS
 if test -n "${CXXFLAGS}"; then
   user_set_cxxflags=yes
@@ -173,9 +176,6 @@ dnl Define where to find boost includes
 dnl defines BOOST_CFLAGS
 GR_REQUIRE_BOOST_INCLUDES
 
-DEFINES=""
-AC_SUBST(DEFINES)
-
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
 AC_ARG_ENABLE(
diff --git a/gnuradio-core/src/lib/io/io.i b/gnuradio-core/src/lib/io/io.i
index e6ed4c6a..7baf94ef 100644
--- a/gnuradio-core/src/lib/io/io.i
+++ b/gnuradio-core/src/lib/io/io.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2007 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -34,8 +34,8 @@
 #include <ppio.h>
 #include <gr_message_source.h>
 #include <gr_message_sink.h>
-#include <gr_udp_sink.cc>
-#include <gr_udp_source.cc>
+#include <gr_udp_sink.h>
+#include <gr_udp_source.h>
 
 %}
 
diff --git a/omnithread/omnithread.h b/omnithread/omnithread.h
index b6df34d7..bd916561 100644
--- a/omnithread/omnithread.h
+++ b/omnithread/omnithread.h
@@ -73,7 +73,7 @@ class omni_thread;
 //
 
 #if !defined(OMNITHREAD_POSIX) && !defined(OMNITHREAD_NT) && defined HAVE_CONFIG_H
-#include <config.h>
+// #include <config.h>      // No, No, No!  Never include <config.h> from a header
 #endif
 
 #if defined(OMNITHREAD_POSIX)