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 /usrp2/host/lib | |
| 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 'usrp2/host/lib')
| -rw-r--r-- | usrp2/host/lib/control.cc | 2 | ||||
| -rw-r--r-- | usrp2/host/lib/control.h | 2 | ||||
| -rw-r--r-- | usrp2/host/lib/ring.h | 2 | ||||
| -rw-r--r-- | usrp2/host/lib/usrp2_thread.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/usrp2/host/lib/control.cc b/usrp2/host/lib/control.cc index 97d969fa6..4b8597c60 100644 --- a/usrp2/host/lib/control.cc +++ b/usrp2/host/lib/control.cc @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <omni_time.h> +#include <gnuradio/omni_time.h> #include "control.h" #include <iostream> diff --git a/usrp2/host/lib/control.h b/usrp2/host/lib/control.h index 33f73fa94..0e8fcfe57 100644 --- a/usrp2/host/lib/control.h +++ b/usrp2/host/lib/control.h @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONTROL_H #define INCLUDED_CONTROL_H -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <usrp2_eth_packet.h> namespace usrp2 { diff --git a/usrp2/host/lib/ring.h b/usrp2/host/lib/ring.h index 2f4346ca6..19ae9ae97 100644 --- a/usrp2/host/lib/ring.h +++ b/usrp2/host/lib/ring.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_RING_H #define INCLUDED_RING_H -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <stddef.h> #include <vector> #include <boost/shared_ptr.hpp> diff --git a/usrp2/host/lib/usrp2_thread.h b/usrp2/host/lib/usrp2_thread.h index c7f9e1aaf..12723e947 100644 --- a/usrp2/host/lib/usrp2_thread.h +++ b/usrp2/host/lib/usrp2_thread.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_USRP2_THREAD_H #define INCLUDED_USRP2_THREAD_H -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <usrp2_impl.h> namespace usrp2 { |