diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-01-18 15:47:06 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-01-18 15:47:06 -0500 |
| commit | 3fa56a46fb91dabbc4973f9d3983639a88c12d6c (patch) | |
| tree | 3e579a415b106e68f55b054c76981fcda6248e73 | |
| parent | 213f24448cfc755679b541bc7023e2d0124db42d (diff) | |
| parent | 411e687b8de2a657c680658801e1c5ebdc131537 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/lib/thread/thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc index f93543f58c..5e5874ec0f 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -125,7 +125,7 @@ namespace gr { get_current_thread_id() { // Not implemented on OSX - return; + return NULL; } void |