diff options
| author | jcorgan | 2009-02-25 19:04:35 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-25 19:04:35 +0000 |
| commit | c48f42b58c67eefd19ea1a803329bcf62eac06e9 (patch) | |
| tree | d03af64023553b5f340ae676a918793e2ab39068 /gnuradio-core/src/lib/runtime | |
| parent | 203024bad3191ea14eff902549e6b4d95e08e43c (diff) | |
| download | gnuradio-c48f42b58c67eefd19ea1a803329bcf62eac06e9.tar.gz gnuradio-c48f42b58c67eefd19ea1a803329bcf62eac06e9.tar.bz2 gnuradio-c48f42b58c67eefd19ea1a803329bcf62eac06e9.zip | |
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/lib/runtime')
| -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 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.h b/gnuradio-core/src/lib/runtime/gr_msg_queue.h index 38556b3ca..f965887e1 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 dc0b232a7..3295f849e 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 |