fixes for gcc 4.3

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9351 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-msdd6000/src/msdd_source_base.cc b/gr-msdd6000/src/msdd_source_base.cc
index 8adb72553a6d5c302a7e70cf12aa2d6a059a956b..f1de068e3e11a0de82ece56e5eb780222430e6f8 100644 (file)
--- a/gr-msdd6000/src/msdd_source_base.cc
+++ b/gr-msdd6000/src/msdd_source_base.cc
@@ -33,6 +33,7 @@
 #include <omnithread.h>
 #include <stdexcept>
 #include <iostream>
+#include <limits.h>
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
@@ -640,7 +641,7 @@ msdd_source_base::set_verbose (bool verbose)
 bool
 msdd_source_base::set_pga (int which, double gain)
 {
-       if (gain >= PGA_MIN & gain <= PGA_MAX) {
+       if (gain >= PGA_MIN && gain <= PGA_MAX) {
          pimpl->d_gain = gain;
                return true;
        }
@@ -813,8 +814,10 @@ msdd_source_base::serial_number()
 bool msdd_source_base::set_desired_packet_size (int which, unsigned long packet_size) {
   bool result(false);
   
-  if (pimpl->d_desired_sample_size < 2^32) { // FIXME: find maximum sample request for MSDD check if greater than 
+  //if (pimpl->d_desired_sample_size < 2^32) { // FIXME: find maximum sample request for MSDD check if greater than 
+  if (pimpl->d_desired_sample_size < LONG_MAX) { // FIXME: find maximum sample request for MSDD check if greater than 
     pimpl->d_desired_sample_size = packet_size;
+    result = true;
   }
   return result;
 }

diff --git a/gr-msdd6000/src/msdd_source_simple.cc b/gr-msdd6000/src/msdd_source_simple.cc
index ec83c5bff91c54bc801e5693cfe98923ee316c62..cefac5476acba483db404cea4a0a481cf1329440 100644 (file)
--- a/gr-msdd6000/src/msdd_source_simple.cc
+++ b/gr-msdd6000/src/msdd_source_simple.cc
@@ -24,6 +24,7 @@
 
 #include <msdd_source_simple.h>
 #include <gr_io_signature.h>
+#include <string.h>
 
 
 msdd_source_simple_sptr