diff options
| author | michaelld | 2007-08-17 20:34:21 +0000 |
|---|---|---|
| committer | michaelld | 2007-08-17 20:34:21 +0000 |
| commit | 8e44b73ab454947a1d2b97f8e793d1e481db2b5a (patch) | |
| tree | 000b08e154672e8b05735947a7b85ee5c2b64724 /usrp | |
| parent | 7dca4d18c5ebaf1bca2a0413f5dbb2941b396828 (diff) | |
| download | gnuradio-8e44b73ab454947a1d2b97f8e793d1e481db2b5a.tar.gz gnuradio-8e44b73ab454947a1d2b97f8e793d1e481db2b5a.tar.bz2 gnuradio-8e44b73ab454947a1d2b97f8e793d1e481db2b5a.zip | |
Changes so that OSX's FUSB will use gr's omnithreads instead of pthreads.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6149 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp')
| -rw-r--r-- | usrp/host/lib/legacy/Makefile.am | 2 | ||||
| -rw-r--r-- | usrp/host/lib/legacy/fusb_darwin.cc | 2 | ||||
| -rw-r--r-- | usrp/host/lib/legacy/mld_threads.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index 4917449a2..3dd10bf1c 100644 --- a/usrp/host/lib/legacy/Makefile.am +++ b/usrp/host/lib/legacy/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(USRP_INCLUDES) +INCLUDES = $(USRP_INCLUDES) $(OMNITHREAD_INCLUDES) lib_LTLIBRARIES = libusrp.la diff --git a/usrp/host/lib/legacy/fusb_darwin.cc b/usrp/host/lib/legacy/fusb_darwin.cc index c6127e26e..61fe22579 100644 --- a/usrp/host/lib/legacy/fusb_darwin.cc +++ b/usrp/host/lib/legacy/fusb_darwin.cc @@ -26,7 +26,7 @@ // tell mld_threads to NOT use omni_threads, // but rather Darwin's pthreads -#undef _USE_OMNI_THREADS_ +#define _USE_OMNI_THREADS_ #include <usb.h> #include "fusb.h" diff --git a/usrp/host/lib/legacy/mld_threads.h b/usrp/host/lib/legacy/mld_threads.h index 1653e83eb..6e60e8837 100644 --- a/usrp/host/lib/legacy/mld_threads.h +++ b/usrp/host/lib/legacy/mld_threads.h @@ -27,8 +27,9 @@ /* classes which allow for either pthreads or omni_threads */ +#define __macos__ #ifdef _USE_OMNI_THREADS_ -#include <gnuradio/omnithread.h> +#include <omnithread.h> #else #include <pthread.h> #endif |