Merge branch 'master' of http://gnuradio.org/git/gnuradio into fix_build_dir_order

3 files changed, 15 insertions, 9 deletions

diff --git a/docs/doxygen/other/metadata.dox b/docs/doxygen/other/metadata.dox
index f867a06f2..b527b2100 100644
--- a/docs/doxygen/other/metadata.dox
+++ b/docs/doxygen/other/metadata.dox
@@ -298,7 +298,7 @@ The file sink example can be switched to use a signal source instead
 of a UHD source, but no extra tagged data is used in this mode.
 
 The file source example pushes the data stream to a new raw file while
-a tag debugger block prints out any tags observed in the metedata
+a tag debugger block prints out any tags observed in the metadata
 file. A QT GUI time sink is used to look at the signal as well.
 
 The versions with 'vector' in the name are similar except they use
diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc
index ad16e9fca..b707bfac4 100644
--- a/gr-blocks/lib/file_meta_sink_impl.cc
+++ b/gr-blocks/lib/file_meta_sink_impl.cc
@@ -26,14 +26,12 @@
 
 #include "file_meta_sink_impl.h"
 #include <gr_io_signature.h>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdexcept>
-#include <cstdio>
-
-namespace gr {
-  namespace blocks {
+#include <stdio.h>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
@@ -52,6 +50,11 @@ namespace gr {
 #define	OUR_O_LARGEFILE 0
 #endif
 
+
+namespace gr {
+  namespace blocks {
+
+
     file_meta_sink::sptr
     file_meta_sink::make(size_t itemsize, const std::string &filename,
 			 double samp_rate, double relative_rate,
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index fb39b205b..42fdabb54 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -26,14 +26,12 @@
 
 #include "file_meta_source_impl.h"
 #include <gr_io_signature.h>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdexcept>
-#include <cstdio>
-
-namespace gr {
-  namespace blocks {
+#include <stdio.h>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
@@ -52,6 +50,11 @@ namespace gr {
 #define	OUR_O_LARGEFILE 0
 #endif
 
+
+namespace gr {
+  namespace blocks {
+
+
     file_meta_source::sptr
     file_meta_source::make(const std::string &filename,
 			   bool repeat,