diff options
| author | Eric Blossom | 2010-10-29 02:20:32 -0700 |
|---|---|---|
| committer | Eric Blossom | 2010-11-10 12:13:53 -0800 |
| commit | cbfffe4100daff91746db0b6ea66cec9f7b2ceed (patch) | |
| tree | 250492f2f8b05aded0547537a6dcb65b8143575b | |
| parent | 299aba578b76e1f07cb3e4e5ff59ee6b306afb5a (diff) | |
| download | gnuradio-cbfffe4100daff91746db0b6ea66cec9f7b2ceed.tar.gz gnuradio-cbfffe4100daff91746db0b6ea66cec9f7b2ceed.tar.bz2 gnuradio-cbfffe4100daff91746db0b6ea66cec9f7b2ceed.zip | |
Move sizeof_* from gnuradio.i to runtime.i to avoid multiple definitions
| -rw-r--r-- | gnuradio-core/src/lib/runtime/runtime.i | 7 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-core/src/lib/runtime/runtime.i index 20cf68a03..ca89b8fbd 100644 --- a/gnuradio-core/src/lib/runtime/runtime.i +++ b/gnuradio-core/src/lib/runtime/runtime.i @@ -40,6 +40,13 @@ #include <gr_top_block.h> %} +%constant int sizeof_char = sizeof(char); +%constant int sizeof_short = sizeof(short); +%constant int sizeof_int = sizeof(int); +%constant int sizeof_float = sizeof(float); +%constant int sizeof_double = sizeof(double); +%constant int sizeof_gr_complex = sizeof(gr_complex); + %include <gr_io_signature.i> %include <gr_buffer.i> %include <gr_basic_block.i> diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index a30655f45..6eb44cbe9 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -76,15 +76,6 @@ namespace std { //////////////////////////////////////////////////////////////////////// -%constant int sizeof_char = sizeof(char); -%constant int sizeof_short = sizeof(short); -%constant int sizeof_int = sizeof(int); -%constant int sizeof_float = sizeof(float); -%constant int sizeof_double = sizeof(double); -%constant int sizeof_gr_complex = sizeof(gr_complex); - -//////////////////////////////////////////////////////////////////////// - #ifndef SW_RUNTIME // import runtime.i for all but sw_runtime, since it needs to %include %import <runtime.i> |