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 /mblock/src | |
| 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 'mblock/src')
| -rw-r--r-- | mblock/src/include/mblock/msg_queue.h | 2 | ||||
| -rw-r--r-- | mblock/src/include/mblock/runtime.h | 2 | ||||
| -rw-r--r-- | mblock/src/include/mblock/time.h | 2 | ||||
| -rw-r--r-- | mblock/src/lib/mb_runtime_base.h | 2 | ||||
| -rw-r--r-- | mblock/src/lib/mb_runtime_thread_per_block.cc | 2 | ||||
| -rw-r--r-- | mblock/src/lib/mb_worker.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/mblock/src/include/mblock/msg_queue.h b/mblock/src/include/mblock/msg_queue.h index 31ff65a51..a23397081 100644 --- a/mblock/src/include/mblock/msg_queue.h +++ b/mblock/src/include/mblock/msg_queue.h @@ -22,7 +22,7 @@ #define INCLUDED_MB_MSG_QUEUE_H #include <mblock/common.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <mblock/time.h> /*! diff --git a/mblock/src/include/mblock/runtime.h b/mblock/src/include/mblock/runtime.h index 4236e346f..4d9d6736b 100644 --- a/mblock/src/include/mblock/runtime.h +++ b/mblock/src/include/mblock/runtime.h @@ -22,7 +22,7 @@ #define INCLUDED_MB_RUNTIME_H #include <mblock/common.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> /*! * \brief Public constructor (factory) for mb_runtime objects. diff --git a/mblock/src/include/mblock/time.h b/mblock/src/include/mblock/time.h index cba6be785..630fa845c 100644 --- a/mblock/src/include/mblock/time.h +++ b/mblock/src/include/mblock/time.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_TIME_H #define INCLUDED_MB_TIME_H -#include <omni_time.h> +#include <gnuradio/omni_time.h> typedef omni_time mb_time; #endif /* INCLUDED_MB_TIME_H */ diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h index 019662bc2..b88a9ca4e 100644 --- a/mblock/src/lib/mb_runtime_base.h +++ b/mblock/src/lib/mb_runtime_base.h @@ -23,7 +23,7 @@ #define INCLUDED_MB_RUNTIME_BASE_H #include <mblock/runtime.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <mblock/time.h> /* diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc index d12014a16..ed292ee7c 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.cc +++ b/mblock/src/lib/mb_runtime_thread_per_block.cc @@ -28,7 +28,7 @@ #include <mblock/class_registry.h> #include <mblock/exception.h> #include <mb_worker.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <iostream> #include <mb_msg_accepter_msgq.h> diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h index b840ae557..9831de926 100644 --- a/mblock/src/lib/mb_worker.h +++ b/mblock/src/lib/mb_worker.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_MB_WORKER_H #define INCLUDED_MB_WORKER_H -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <mblock/common.h> #include <mblock/class_registry.h> |