diff options
| author | Paul Cercueil <paul.cercueil@analog.com> | 2015-09-14 14:53:35 +0200 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:23:22 -0700 |
| commit | 25142dad0464bed59dc03672931aab637f82d376 (patch) | |
| tree | 1ec31795dbb5a1d98aa941e17c38b30c58964e02 /gnuradio-runtime/lib/flat_flowgraph.cc | |
| parent | ae26f969c9c260556aad4ffd006fea96f3452d01 (diff) | |
cmake: Windows-specific fixes for compatibility
* Properly wrap the prefix variables in quotation marks. This allows
to set an empty prefix.
* Fix library names when compiling for Windows. This now also works
when using mingw-w64.
* Fix boost module name when compiling with mingw-w64
* Fix build under mingw-w64
* Fix config.h header to avoid macro redefinition
* Remove duplicated Boost::thread entry in dependencies list
Diffstat (limited to 'gnuradio-runtime/lib/flat_flowgraph.cc')
| -rw-r--r-- | gnuradio-runtime/lib/flat_flowgraph.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc index 81c1184cfa..82680bfc2d 100644 --- a/gnuradio-runtime/lib/flat_flowgraph.cc +++ b/gnuradio-runtime/lib/flat_flowgraph.cc @@ -320,7 +320,7 @@ namespace gr { const int alignment = volk_get_alignment(); for(int i = 0; i < block->detail()->ninputs(); i++) { void *r = (void*)block->detail()->input(i)->read_pointer(); - unsigned long int ri = (unsigned long int)r % alignment; + uintptr_t ri = (uintptr_t)r % alignment; //std::cerr << "reader: " << r << " alignment: " << ri << std::endl; if(ri != 0) { size_t itemsize = block->detail()->input(i)->get_sizeof_item(); @@ -332,7 +332,7 @@ namespace gr { for(int i = 0; i < block->detail()->noutputs(); i++) { void *w = (void*)block->detail()->output(i)->write_pointer(); - unsigned long int wi = (unsigned long int)w % alignment; + uintptr_t wi = (uintptr_t)w % alignment; //std::cerr << "writer: " << w << " alignment: " << wi << std::endl; if(wi != 0) { size_t itemsize = block->detail()->output(i)->get_sizeof_item(); |