diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:05:38 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:05:38 -0700 |
| commit | c5f7b07aff9320e3d13bb8d26aa4dc43093e569a (patch) | |
| tree | 25720b562fa01915560ad736e1b2a51a819cd514 /gnuradio-runtime/lib/thread/thread.cc | |
| parent | 45d19af2509272020298499aec37c3af42cb71d5 (diff) | |
| parent | 0d32337545f554dffe0dee69f5f1415ac2f5b673 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/lib/thread/thread.cc')
| -rw-r--r-- | gnuradio-runtime/lib/thread/thread.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc index 483dfed493..f2606c71ae 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -28,7 +28,7 @@ #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) -#include <Windows.h> +#include <windows.h> namespace gr { namespace thread { @@ -111,6 +111,7 @@ namespace gr { // Not implemented on Windows return -1; } +#ifndef __MINGW32__ #pragma pack(push,8) typedef struct tagTHREADNAME_INFO { @@ -152,6 +153,13 @@ namespace gr { _set_thread_name(thread, name.c_str(), dwThreadId); } +#else + void + set_thread_name(gr_thread_t thread, std::string name) + { + /* Not implemented on mingw-w64 */ + } +#endif /* !__MINGW32__ */ } /* namespace thread */ } /* namespace gr */ |