diff options
| author | MBoerschig <code+github at boerschig dot net> | 2019-01-06 00:14:06 +0100 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2019-03-24 21:36:09 +0100 |
| commit | 8ecdef41e47641f820fff73e0ad11c0890544b71 (patch) | |
| tree | 25a6663a7b770f9ce65a4882c6eb017c489f785e | |
| parent | e02eed791069c82bd262f4b2cbe324db76326e54 (diff) | |
vocoder: Fix build on NetBSD.
There was an #ifdef missing in lib/thread/thread.cc and in gr-vocoder
the include directive for gsm.h contains a gsm/ prefix.
The cmake FindGSM.cmake looks for **/include/ and **/include/gsm
anyways.
| -rw-r--r-- | gnuradio-runtime/lib/thread/thread.cc | 3 | ||||
| -rw-r--r-- | gr-vocoder/lib/gsm_fr_decode_ps_impl.h | 2 | ||||
| -rw-r--r-- | gr-vocoder/lib/gsm_fr_encode_sp_impl.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc index 4db91d4dbe..2a5f3f7c02 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -166,7 +166,8 @@ namespace gr { #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \ - defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) + defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ + defined(__NetBSD__) namespace gr { namespace thread { diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h index 3e60b21293..afd4dd34a7 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h @@ -26,7 +26,7 @@ #include <gnuradio/vocoder/gsm_fr_decode_ps.h> extern "C"{ -#include "gsm/gsm.h" +#include "gsm.h" } namespace gr { diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h index 4a859d7b30..4b045ac657 100644 --- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h +++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h @@ -26,7 +26,7 @@ #include <gnuradio/vocoder/gsm_fr_encode_sp.h> extern "C"{ -#include "gsm/gsm.h" +#include "gsm.h" } namespace gr { |