diff options
| author | ptrkrysik <ptrkrysik@gmail.com> | 2014-12-13 10:11:00 +0100 |
|---|---|---|
| committer | ptrkrysik <ptrkrysik@gmail.com> | 2014-12-13 10:11:00 +0100 |
| commit | 3be74a732b3fc4de0f99249e8bca975fee760210 (patch) | |
| tree | 81731b4d5022ce40f8b0983c310c42f7d1a6838f /lib/receiver | |
| parent | 0cd9ef0a801eeab7f501d012006f379b86c887a1 (diff) | |
Changed grgsm install directories and prefixes from "gsm" to "grgsm". The old prefix caused conflicts with libraries already available.
Diffstat (limited to 'lib/receiver')
| -rw-r--r-- | lib/receiver/receiver_impl.cc | 9 | ||||
| -rw-r--r-- | lib/receiver/receiver_impl.h | 4 | ||||
| -rw-r--r-- | lib/receiver/sch.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/lib/receiver/receiver_impl.cc b/lib/receiver/receiver_impl.cc index 378910d..4d833ae 100644 --- a/lib/receiver/receiver_impl.cc +++ b/lib/receiver/receiver_impl.cc @@ -25,9 +25,6 @@ #endif #include <gnuradio/io_signature.h> -#include "receiver_impl.h" - -#include <gnuradio/io_signature.h> #include <gnuradio/math.h> #include <math.h> #include <boost/circular_buffer.hpp> @@ -35,11 +32,13 @@ #include <numeric> #include <viterbi_detector.h> #include <string.h> -#include <sch.h> #include <iostream> #include <iomanip> #include <boost/scoped_ptr.hpp> -#include <gsm/endian.h> + +#include <sch.h> +#include "receiver_impl.h" +#include <grgsm/endian.h> //files included for debuging //#include "plotting/plotting.hpp" diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h index a6edbce..6dfeaf6 100644 --- a/lib/receiver/receiver_impl.h +++ b/lib/receiver/receiver_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GSM_RECEIVER_IMPL_H #define INCLUDED_GSM_RECEIVER_IMPL_H -#include <gsm/receiver/receiver.h> -#include <gsm/gsmtap.h> +#include <grgsm/receiver/receiver.h> +#include <grgsm/gsmtap.h> #include <gsm_constants.h> #include <receiver_config.h> diff --git a/lib/receiver/sch.h b/lib/receiver/sch.h index 11a6d06..21976a4 100644 --- a/lib/receiver/sch.h +++ b/lib/receiver/sch.h @@ -2,7 +2,7 @@ #ifndef __SCH_H__ #define __SCH_H__ 1 -#include <gsm/api.h> +#include <grgsm/api.h> #ifdef __cplusplus extern "C" |