gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_stream_mux.cc

diff --git a/gnuradio-core/src/lib/general/gr_stream_mux.cc b/gnuradio-core/src/lib/general/gr_stream_mux.cc
index e7e45de74c4934773c0ed7cb827b6009163fa6bb..06556b583674214f9fd2157fb5211bdcf1df4397 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_stream_mux.cc
+++ b/gnuradio-core/src/lib/general/gr_stream_mux.cc
@@ -6,7 +6,7 @@
  * 
  * 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 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -26,6 +26,8 @@
 
 #include <gr_stream_mux.h>
 #include <gr_io_signature.h>
+#include <string.h>
+#include <cstdio>
 
 #define VERBOSE 0
 
@@ -85,7 +87,7 @@ gr_stream_mux::general_work(int noutput_items,
     if(VERBOSE) {
       printf("mux: nouput_items: %d   d_stream: %d\n", noutput_items, d_stream);
       for(size_t i = 0; i < d_lengths.size(); i++)
-       printf("\tninput_items[%d]: %d\n", i, ninput_items[i]);
+       printf("\tninput_items[%zu]: %d\n", i, ninput_items[i]);
     }
 
     while (1) {