6 files changed, 33 insertions, 20 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/wavfile.h b/gr-blocks/include/gnuradio/blocks/wavfile.h
index 9440105e76..bc1175a6cb 100644
--- a/gr-blocks/include/gnuradio/blocks/wavfile.h
+++ b/gr-blocks/include/gnuradio/blocks/wavfile.h
@@ -23,6 +23,9 @@
 // This file stores all the RIFF file type knowledge for the wavfile_*
 // gnuradio/blocks.
 
+#ifndef _GR_WAVFILE_H_
+#define _GR_WAVFILE_H_
+
 #include <gnuradio/blocks/api.h>
 #include <cstdio>
 
@@ -44,8 +47,7 @@ namespace gr {
      * \return True on a successful read, false if the file could not be read or is
      *         not a valid WAV file.
      */
-    bool
-    wavheader_parse(FILE *fp,
+    BLOCKS_API bool wavheader_parse(FILE *fp,
 		    unsigned int &sample_rate,
 		    int &nchans,
 		    int &bytes_per_sample,
@@ -58,8 +60,7 @@ namespace gr {
      * \details
      * Takes care of endianness.
      */
-    short int
-    wav_read_sample(FILE *fp, int bytes_per_sample);
+    BLOCKS_API short int wav_read_sample(FILE *fp, int bytes_per_sample);
 
 
     /*!
@@ -69,8 +70,7 @@ namespace gr {
      * not known a-priori (file and chunk lengths). Use
      * gri_wavheader_complete() to fill these in.
      */
-    bool
-    wavheader_write(FILE *fp,
+    BLOCKS_API bool wavheader_write(FILE *fp,
 		    unsigned int sample_rate,
 		    int nchans,
 		    int bytes_per_sample);
@@ -81,8 +81,7 @@ namespace gr {
      * \details
      * Takes care of endianness.
      */
-    void
-    wav_write_sample(FILE *fp, short int sample, int bytes_per_sample);
+    BLOCKS_API void wav_write_sample(FILE *fp, short int sample, int bytes_per_sample);
 
 
     /*!
@@ -97,8 +96,10 @@ namespace gr {
      * \param[in] fp         File pointer to an open WAV file with a blank header
      * \param[in] byte_count Length of all samples written to the file in bytes.
      */
-    bool
-    wavheader_complete(FILE *fp, unsigned int byte_count);
+    BLOCKS_API bool wavheader_complete(FILE *fp, unsigned int byte_count);
 
   } /* namespace blocks */
 } /* namespace gr */
+
+#endif /* _GR_WAVFILE_H_ */
+
diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.cc b/gr-blocks/lib/stream_to_tagged_stream_impl.cc
index 82344447cc..341961bde2 100644
--- a/gr-blocks/lib/stream_to_tagged_stream_impl.cc
+++ b/gr-blocks/lib/stream_to_tagged_stream_impl.cc
@@ -1,19 +1,21 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2013 <+YOU OR YOUR COMPANY+>.
+ * Copyright 2013 Free Software Foundation, Inc.
  *
- * This is free software; you can redistribute it and/or modify
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
- * This software is distributed in the hope that it will be useful,
+ * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
+ * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc
index 865082e05f..b0d2e7ff96 100644
--- a/gr-blocks/lib/wavfile.cc
+++ b/gr-blocks/lib/wavfile.cc
@@ -31,7 +31,6 @@
 
 namespace gr {
   namespace blocks {
-
 #define VALID_COMPRESSION_TYPE 0x0001
 
     // Basically, this is the opposite of htonx() and ntohx()
diff --git a/gr-blocks/python/blocks/qa_tag_gate.py b/gr-blocks/python/blocks/qa_tag_gate.py
index 4d22c73adb..acb2c68a82 100755
--- a/gr-blocks/python/blocks/qa_tag_gate.py
+++ b/gr-blocks/python/blocks/qa_tag_gate.py
@@ -1,19 +1,21 @@
 #!/usr/bin/env python
 #
-# Copyright 2013 <+YOU OR YOUR COMPANY+>.
+# Copyright 2013 Free Software Foundation, Inc.
 #
-# This is free software; you can redistribute it and/or modify
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
-# This software is distributed in the hope that it will be useful,
+# GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this software; see the file COPYING.  If not, write to
+# along with GNU Radio; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 #
diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc
index ca4a567ca3..16e8d20084 100644
--- a/gr-qtgui/lib/number_sink_impl.cc
+++ b/gr-qtgui/lib/number_sink_impl.cc
@@ -32,6 +32,15 @@
 #include <qwt_symbol.h>
 #include <cmath>
 
+#ifdef _MSC_VER
+#define isfinite _finite
+
+#include <float.h>
+namespace std {
+    using ::_finite;
+}
+#endif
+
 namespace gr {
   namespace qtgui {
 
diff --git a/gr-uhd/python/uhd/__init__.py b/gr-uhd/python/uhd/__init__.py
index 21f066bf1f..6d7f232466 100644
--- a/gr-uhd/python/uhd/__init__.py
+++ b/gr-uhd/python/uhd/__init__.py
@@ -117,7 +117,7 @@ def _prepare_uhd_swig():
                         if kwargs.has_key(key): kwargs[key] = cast(kwargs[key])
                     except: pass
                 #dont pass kwargs, it confuses swig, map into args list:
-                for key in ('device_addr', 'stream_args', 'io_type', 'num_channels'):
+                for key in ('device_addr', 'stream_args', 'io_type', 'num_channels', 'msgq'):
                     if kwargs.has_key(key): args.append(kwargs[key])
                 return old_constructor(*args)
             return constructor_interceptor