diff options
author | Tom Rondeau | 2011-03-15 13:46:02 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-03-15 13:46:02 -0400 |
commit | 338b01e7b5ecad7e324098a2671d3fa650be035e (patch) | |
tree | 247b61f2fbfdadc6ce4f39ad2f637a22cd3163ae /gr-qtgui/src/lib/qtgui_sink_c.h | |
parent | 1ecc511ad673f37498ebc29147c776ca9b4b6490 (diff) | |
parent | b4bd3e47189932b42ce821bb7076fce811b3e3eb (diff) | |
download | gnuradio-338b01e7b5ecad7e324098a2671d3fa650be035e.tar.gz gnuradio-338b01e7b5ecad7e324098a2671d3fa650be035e.tar.bz2 gnuradio-338b01e7b5ecad7e324098a2671d3fa650be035e.zip |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gr-qtgui/src/lib/qtgui_sink_c.h')
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_c.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-qtgui/src/lib/qtgui_sink_c.h b/gr-qtgui/src/lib/qtgui_sink_c.h index 9aee66503..bbf9983b0 100644 --- a/gr-qtgui/src/lib/qtgui_sink_c.h +++ b/gr-qtgui/src/lib/qtgui_sink_c.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008,2009 Free Software Foundation, Inc. + * Copyright 2008,2009,2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -76,7 +76,7 @@ private: double d_bandwidth; std::string d_name; - pthread_mutex_t d_pmutex; + gruel::mutex d_mutex; bool d_shift; gri_fft_complex *d_fft; |