diff options
author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2013-01-02 10:08:28 -0800 |
---|---|---|
committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2013-01-02 10:08:28 -0800 |
commit | 09a9e19eb5970f0eeb8ad247054d22493367f30a (patch) | |
tree | f54285ec3cdd71619854ba6eb436263a13502aee /gr-blocks/lib/file_meta_source_impl.cc | |
parent | 69f57364c5b8fc575b6a956468025da37d32b1a6 (diff) | |
parent | f4500ccb63f9d7e35460d2699472e1cf498d8229 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-blocks/lib/file_meta_source_impl.cc')
-rw-r--r-- | gr-blocks/lib/file_meta_source_impl.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index fb39b205b4..42fdabb541 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, |