[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4333 - in gnuradio/trunk: . config gnuradio-core/src/
From: |
eb |
Subject: |
[Commit-gnuradio] r4333 - in gnuradio/trunk: . config gnuradio-core/src/lib/io omnithread |
Date: |
Mon, 29 Jan 2007 20:59:34 -0700 (MST) |
Author: eb
Date: 2007-01-29 20:59:34 -0700 (Mon, 29 Jan 2007)
New Revision: 4333
Modified:
gnuradio/trunk/config/gr_omnithread.m4
gnuradio/trunk/configure.ac
gnuradio/trunk/gnuradio-core/src/lib/io/io.i
gnuradio/trunk/omnithread/omnithread.h
Log:
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.
Modified: gnuradio/trunk/config/gr_omnithread.m4
===================================================================
--- gnuradio/trunk/config/gr_omnithread.m4 2007-01-30 03:17:18 UTC (rev
4332)
+++ gnuradio/trunk/config/gr_omnithread.m4 2007-01-30 03:59:34 UTC (rev
4333)
@@ -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 @@
# 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 @@
],
[
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.])]
)
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2007-01-30 03:17:18 UTC (rev 4332)
+++ gnuradio/trunk/configure.ac 2007-01-30 03:59:34 UTC (rev 4333)
@@ -25,6 +25,9 @@
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 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(
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/io.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/io.i 2007-01-30 03:17:18 UTC
(rev 4332)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/io.i 2007-01-30 03:59:34 UTC
(rev 4333)
@@ -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>
%}
Modified: gnuradio/trunk/omnithread/omnithread.h
===================================================================
--- gnuradio/trunk/omnithread/omnithread.h 2007-01-30 03:17:18 UTC (rev
4332)
+++ gnuradio/trunk/omnithread/omnithread.h 2007-01-30 03:59:34 UTC (rev
4333)
@@ -73,7 +73,7 @@
//
#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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4333 - in gnuradio/trunk: . config gnuradio-core/src/lib/io omnithread,
eb <=