diff options
| author | Michael L Dickens | 2013-01-03 09:40:47 -0500 |
|---|---|---|
| committer | Michael L Dickens | 2013-01-03 09:40:47 -0500 |
| commit | 34d34586ff4b42d392eee73612bb460f4c21c797 (patch) | |
| tree | 78217eaa51084698c425a72271edeec35d73c12c /gr-blocks | |
| parent | e788c523d4f8de3efd64a64f148ac1bf25ea032d (diff) | |
| parent | f90ebba102f5765f924899f2ec566634b096b684 (diff) | |
| download | gnuradio-34d34586ff4b42d392eee73612bb460f4c21c797.tar.gz gnuradio-34d34586ff4b42d392eee73612bb460f4c21c797.tar.bz2 gnuradio-34d34586ff4b42d392eee73612bb460f4c21c797.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into fix_build_dir_order
Diffstat (limited to 'gr-blocks')
| -rw-r--r-- | gr-blocks/lib/file_meta_sink_impl.cc | 11 | ||||
| -rw-r--r-- | gr-blocks/lib/file_meta_source_impl.cc | 11 |
2 files changed, 14 insertions, 8 deletions
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, |