summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorTom Rondeau2011-12-14 22:15:05 -0500
committerTom Rondeau2011-12-14 22:15:05 -0500
commit1f29a384ecd6512f5cb0891dbd651aca8ced86ed (patch)
treebf618d959515fb9b706b10aec2cb5844737b4c98 /gnuradio-core
parent21a79f683ef7c3b0c6337120d056fde452055254 (diff)
parent7b3e1522274a41bcc3b432817bb02c33b2e4f84c (diff)
downloadgnuradio-1f29a384ecd6512f5cb0891dbd651aca8ced86ed.tar.gz
gnuradio-1f29a384ecd6512f5cb0891dbd651aca8ced86ed.tar.bz2
gnuradio-1f29a384ecd6512f5cb0891dbd651aca8ced86ed.zip
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/lib/general/gr_misc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_misc.h b/gnuradio-core/src/lib/general/gr_misc.h
index 78f7e18ac..6e2bf78b7 100644
--- a/gnuradio-core/src/lib/general/gr_misc.h
+++ b/gnuradio-core/src/lib/general/gr_misc.h
@@ -26,7 +26,7 @@
#include <gr_core_api.h>
#include <gr_types.h>
-unsigned int
+GR_CORE_API unsigned int
gr_rounduppow2(unsigned int n);
// FIXME should be template