[Commit-gnuradio] r4893 - in gnuradio/branches/developers/eb/ibu: omnithread usrp/host/lib/inband

[eb]

Author: eb
Date: 2007-04-05 23:28:49 -0600 (Thu, 05 Apr 2007)
New Revision: 4893

Modified:
   gnuradio/branches/developers/eb/ibu/omnithread/posix.cc
   gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.cc
   gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.h
Log:
Never mind, it wasn't missing the define.  Backed out [4892]

Modified: gnuradio/branches/developers/eb/ibu/omnithread/posix.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/omnithread/posix.cc     2007-04-06 
05:16:32 UTC (rev 4892)
+++ gnuradio/branches/developers/eb/ibu/omnithread/posix.cc     2007-04-06 
05:28:49 UTC (rev 4893)
@@ -57,8 +57,6 @@
 #define NoNanoSleep
 #endif
 
-#define PthreadDraftVersion 10
-
 #ifdef HAVE_SYS_TIME_H
 // typedef of struct timeval and gettimeofday();
 #include <sys/time.h>

Modified: 
gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.cc     
2007-04-06 05:16:32 UTC (rev 4892)
+++ gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.cc     
2007-04-06 05:28:49 UTC (rev 4893)
@@ -49,7 +49,8 @@
 static pmt_t s_response_xmit_raw_frame = pmt_intern("response-xmit-raw-frame");
 
 
-usrp_server::usrp_server()
+usrp_server::usrp_server(mb_runtime *rt, const std::string &instance_name, 
pmt_t user_arg)
+  : mb_mblock(rt, instance_name, user_arg)
 {
   // define our ports
 

Modified: gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.h
===================================================================
--- gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.h      
2007-04-06 05:16:32 UTC (rev 4892)
+++ gnuradio/branches/developers/eb/ibu/usrp/host/lib/inband/usrp_server.h      
2007-04-06 05:28:49 UTC (rev 4893)
@@ -42,7 +42,7 @@
   // add more stuff here...
 
 public:
-  usrp_server();
+  usrp_server(mb_runtime *rt, const std::string &instance_name, pmt_t 
user_arg);
   ~usrp_server();
 
   void initial_transition();