diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-25 19:04:35 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-25 19:04:35 +0000 |
| commit | c48f42b58c67eefd19ea1a803329bcf62eac06e9 (patch) | |
| tree | d03af64023553b5f340ae676a918793e2ab39068 /gnuradio-core/src | |
| parent | 203024bad3191ea14eff902549e6b4d95e08e43c (diff) | |
Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread header files into /gnuradio. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10506 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_file_sink_base.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_udp_sink.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_udp_source.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_wavfile_sink.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gri_logger.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_msg_queue.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_sptr_magic.cc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.h b/gnuradio-core/src/lib/io/gr_file_sink_base.h index c848818f82..f36f5ac978 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink_base.h +++ b/gnuradio-core/src/lib/io/gr_file_sink_base.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_FILE_SINK_BASE_H #define INCLUDED_GR_FILE_SINK_BASE_H -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <cstdio> /*! diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h index e59380011b..99f1b29353 100644 --- a/gnuradio-core/src/lib/io/gr_udp_sink.h +++ b/gnuradio-core/src/lib/io/gr_udp_sink.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_UDP_SINK_H #include <gr_sync_block.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #if defined(HAVE_SOCKET) #include <sys/socket.h> #include <arpa/inet.h> diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h index a4403c3d6d..0497401598 100644 --- a/gnuradio-core/src/lib/io/gr_udp_source.h +++ b/gnuradio-core/src/lib/io/gr_udp_source.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_UDP_SOURCE_H #include <gr_sync_block.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #if defined(HAVE_SOCKET) #include <sys/socket.h> #include <arpa/inet.h> diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.h b/gnuradio-core/src/lib/io/gr_wavfile_sink.h index 3fa06f202f..9429165f60 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_sink.h +++ b/gnuradio-core/src/lib/io/gr_wavfile_sink.h @@ -25,7 +25,7 @@ #include <gr_sync_block.h> #include <gr_file_sink_base.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> class gr_wavfile_sink; typedef boost::shared_ptr<gr_wavfile_sink> gr_wavfile_sink_sptr; diff --git a/gnuradio-core/src/lib/io/gri_logger.h b/gnuradio-core/src/lib/io/gri_logger.h index da54e56a29..e5caf7d06a 100644 --- a/gnuradio-core/src/lib/io/gri_logger.h +++ b/gnuradio-core/src/lib/io/gri_logger.h @@ -23,7 +23,7 @@ #define INCLUDED_GRI_LOGGER_H #include <stddef.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <gr_buffer.h> class gri_log_poster; diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.h b/gnuradio-core/src/lib/runtime/gr_msg_queue.h index 38556b3cae..f965887e16 100644 --- a/gnuradio-core/src/lib/runtime/gr_msg_queue.h +++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.h @@ -23,7 +23,7 @@ #define INCLUDED_GR_MSG_QUEUE_H #include <gr_msg_handler.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> class gr_msg_queue; typedef boost::shared_ptr<gr_msg_queue> gr_msg_queue_sptr; diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc b/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc index dc0b232a7d..3295f849e4 100644 --- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc +++ b/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc @@ -32,7 +32,7 @@ typedef boost::mutex mutex; typedef boost::mutex::scoped_lock scoped_lock; #else - #include <omnithread.h> + #include <gnuradio/omnithread.h> typedef omni_mutex mutex; typedef omni_mutex_lock scoped_lock; #endif |