[Commit-gnuradio] r6149 - gnuradio/trunk/usrp/host/lib/legacy

[michaelld]

Author: michaelld
Date: 2007-08-17 14:34:21 -0600 (Fri, 17 Aug 2007)
New Revision: 6149

Modified:
   gnuradio/trunk/usrp/host/lib/legacy/Makefile.am
   gnuradio/trunk/usrp/host/lib/legacy/fusb_darwin.cc
   gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h
Log:
Changes so that OSX's FUSB will use gr's omnithreads instead of pthreads.



Modified: gnuradio/trunk/usrp/host/lib/legacy/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/Makefile.am     2007-08-17 18:38:47 UTC 
(rev 6148)
+++ gnuradio/trunk/usrp/host/lib/legacy/Makefile.am     2007-08-17 20:34:21 UTC 
(rev 6149)
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(USRP_INCLUDES)
+INCLUDES = $(USRP_INCLUDES) $(OMNITHREAD_INCLUDES)
 
 lib_LTLIBRARIES = libusrp.la
 

Modified: gnuradio/trunk/usrp/host/lib/legacy/fusb_darwin.cc
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/fusb_darwin.cc  2007-08-17 18:38:47 UTC 
(rev 6148)
+++ gnuradio/trunk/usrp/host/lib/legacy/fusb_darwin.cc  2007-08-17 20:34:21 UTC 
(rev 6149)
@@ -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"

Modified: gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h   2007-08-17 18:38:47 UTC 
(rev 6148)
+++ gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h   2007-08-17 20:34:21 UTC 
(rev 6149)
@@ -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