Merge r11462:11485 from jcorgan/omni into trunk.

[debian/gnuradio] / gnuradio-core / src / lib / io / gr_udp_sink.h

diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h
index 13b2befc9efc08835d4c0bdaf9589d0482946be2..f22b92dd035dd5e17f78c37ef3b9686486f61257 100644 (file)
--- a/gnuradio-core/src/lib/io/gr_udp_sink.h
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,7 +24,7 @@
 #define INCLUDED_GR_UDP_SINK_H
 
 #include <gr_sync_block.h>
-#include <gnuradio/omnithread.h>
+#include <boost/thread.hpp>
 #if defined(HAVE_SOCKET)
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -36,6 +36,8 @@
 #include <netinet/in.h>
 #endif
 
+#include <gruel/thread.h>
+
 class gr_udp_sink;
 typedef boost::shared_ptr<gr_udp_sink> gr_udp_sink_sptr;
 
@@ -69,7 +71,7 @@ class gr_udp_sink : public gr_sync_block
  private:
   size_t       d_itemsize;
   bool         d_updated;
-  omni_mutex   d_mutex;
+  gruel::mutex d_mutex;
 
   int            d_payload_size;    // maximum transmission unit (packet length)
   int            d_socket;          // handle to socket