Merge branch 'next' into digital

Conflicts:
	gnuradio-core/src/lib/general/general.i
	gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
	gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
	gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
	gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
	gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
	gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
	gr-digital/lib/digital_constellation_receiver_cb.cc
	gr-digital/python/Makefile.am
	gr-digital/python/__init__.py
	gr-digital/python/generic_mod_demod.py
	gr-digital/python/pkt.py
	gr-digital/python/psk2.py
	gr-digital/python/qam.py

5 files changed, 30 insertions, 12 deletions

diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
index 09fb6c826..11e0a8eb9 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
@@ -34,6 +34,9 @@
 #include <stdexcept>
 #include <stdio.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
   : gr_sync_block ("file_descriptor_sink",
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
index 700ad4aef..334a57848 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
@@ -35,6 +35,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
 						      int fd,
diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
index 154611c32..67184b9c5 100644
--- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
@@ -34,6 +34,10 @@
 #include <iostream>
 #include <gr_tag_info.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 #ifdef O_BINARY
 #define	OUR_O_BINARY O_BINARY
 #else
@@ -179,7 +183,8 @@ gr_tagged_file_sink::work (int noutput_items,
 	  //std::cout << "Found end of burst: "
 	  //	    << idx_stop << ", " << N << std::endl;
 
-	  int count = fwrite (&inbuf[d_itemsize*idx], d_itemsize, idx_stop-idx, d_handle);
+	  int count = fwrite (&inbuf[d_itemsize*idx], d_itemsize,
+			      idx_stop-idx, d_handle);
 	  if (count == 0) {
 	    if(ferror(d_handle)) {
 	      perror("gr_tagged_file_sink: error writing file");
@@ -196,7 +201,8 @@ gr_tagged_file_sink::work (int noutput_items,
 	}
       }
       if(d_state == IN_BURST) {
-	int count = fwrite (&inbuf[idx], d_itemsize, noutput_items-idx, d_handle);
+	int count = fwrite (&inbuf[d_itemsize*idx], d_itemsize,
+			    noutput_items-idx, d_handle);
 	if (count == 0) {
 	  if(ferror(d_handle)) {
 	    perror("gr_tagged_file_sink: error writing file");
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc
index b8375edc2..8f1c6a2bb 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.cc
+++ b/gnuradio-core/src/lib/io/gri_wavfile.cc
@@ -160,25 +160,25 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
   
-  fread(&file_size, 1, 4, fp);
+  fresult = fread(&file_size, 1, 4, fp);
   
   fresult = fread(str_buf, 1, 8, fp);
   if (fresult != 8 || strncmp(str_buf, "WAVEfmt ", 8) || feof(fp)) {
     return false;
   }
   
-  fread(&fmt_hdr_skip, 1, 4, fp);
+  fresult = fread(&fmt_hdr_skip, 1, 4, fp);
   
-  fread(&compression_type, 1, 2, fp);
+  fresult = fread(&compression_type, 1, 2, fp);
   if (wav_to_host(compression_type) != VALID_COMPRESSION_TYPE) {
     return false;
   }
   
-  fread(&nchans,            1, 2, fp);
-  fread(&sample_rate,       1, 4, fp);
-  fread(&avg_bytes_per_sec, 1, 4, fp);
-  fread(&block_align,       1, 2, fp);
-  fread(&bits_per_sample,   1, 2, fp);
+  fresult = fread(&nchans,            1, 2, fp);
+  fresult = fread(&sample_rate,       1, 4, fp);
+  fresult = fread(&avg_bytes_per_sec, 1, 4, fp);
+  fresult = fread(&block_align,       1, 2, fp);
+  fresult = fread(&bits_per_sample,   1, 2, fp);
   
   if (ferror(fp)) {
     return false;
@@ -204,7 +204,7 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
 
-  fread(&chunk_size, 1, 4, fp);
+  fresult = fread(&chunk_size, 1, 4, fp);
   if (ferror(fp)) {
     return false;
   }
@@ -226,7 +226,9 @@ short int
 gri_wav_read_sample(FILE *fp, int bytes_per_sample)
 {
   int16_t buf = 0;
-  fread(&buf, bytes_per_sample, 1, fp);
+  size_t fresult;
+
+  fresult = fread(&buf, bytes_per_sample, 1, fp);
   
   return (short) wav_to_host(buf);
 }
diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
index 668f04cad..14f2b8589 100644
--- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
+++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "microtune_xxxx_eval_board.h"
 #include "microtune_eval_board_defs.h"
 #include "microtune_xxxx.h"