From: michaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 17 Aug 2007 20:34:21 +0000 (+0000)
Subject: Changes so that OSX's FUSB will use gr's omnithreads instead of pthreads.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8e44b73ab454947a1d2b97f8e793d1e481db2b5a;p=debian%2Fgnuradio

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
---

diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am
index 4917449a..3dd10bf1 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 c6127e26..61fe2257 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 1653e83e..6e60e883 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