summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <ikj1234i@yahoo.com>2018-02-19 11:58:40 -0500
committerMax <ikj1234i@yahoo.com>2018-02-19 11:58:40 -0500
commit7bdfe78aa04da83dd3cdf08085e604cf0fcb91ce (patch)
tree10485a54d41ca7bdfd739bf547dd96d926393ab8
parent4cde5ac5d8c7d014ded958b04fb9b5de12344a35 (diff)
build fixes thx MattSR via CS
-rwxr-xr-xinstall.sh2
-rw-r--r--op25/gr-op25_repeater/lib/p25_frame_assembler_impl.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/install.sh b/install.sh
index f52da38..e0281d3 100755
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,7 @@ fi
sudo apt-get update
sudo apt-get build-dep gnuradio
-sudo apt-get install gnuradio gnuradio-dev gr-osmosdr librtlsdr-dev libuhd-dev libhackrf-dev libitpp-dev libpcap-dev cmake git swig
+sudo apt-get install gnuradio gnuradio-dev gr-osmosdr librtlsdr-dev libuhd-dev libhackrf-dev libitpp-dev libpcap-dev cmake git swig build-essential pkg-config doxygen
mkdir build
cd build
diff --git a/op25/gr-op25_repeater/lib/p25_frame_assembler_impl.cc b/op25/gr-op25_repeater/lib/p25_frame_assembler_impl.cc
index dba0aa9..9d5515d 100644
--- a/op25/gr-op25_repeater/lib/p25_frame_assembler_impl.cc
+++ b/op25/gr-op25_repeater/lib/p25_frame_assembler_impl.cc
@@ -39,12 +39,12 @@ namespace gr {
void p25_frame_assembler_impl::p25p2_queue_msg(int duid)
{
- static const char wbuf[2] = {0xff, 0xff}; // dummy NAC
+ static const unsigned char wbuf[2] = {0xff, 0xff}; // dummy NAC
if (!d_do_msgq)
return;
if (d_msg_queue->full_p())
return;
- gr::message::sptr msg = gr::message::make_from_string(std::string(wbuf, 2), duid, 0, 0);
+ gr::message::sptr msg = gr::message::make_from_string(std::string((const char *)wbuf, 2), duid, 0, 0);
d_msg_queue->insert_tail(msg);
}