diff options
| author | Tom Rondeau <tom@trondeau.com> | 2013-11-14 12:45:55 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-11-14 12:45:55 -0500 |
| commit | 3b27cc47e134e0ea33c1856d1afd6e87931607c9 (patch) | |
| tree | 624eb7597a1991bce1cc3f00070737504ebaf934 | |
| parent | 4749434d9b964aa5c452e861f7551b222a4f98ac (diff) | |
| parent | 1fa1ed66f85aaf3e37ca5b0060378a54ce9f50d8 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/swig/gnuradio.i | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/swig/gr_types.i | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/swig/gnuradio.i b/gnuradio-runtime/swig/gnuradio.i index c756ce9189..7056d28ff5 100644 --- a/gnuradio-runtime/swig/gnuradio.i +++ b/gnuradio-runtime/swig/gnuradio.i @@ -28,6 +28,7 @@ // SWIG interface definition //////////////////////////////////////////////////////////////////////// +%include "std_string.i" %include <gr_extras.i> #ifdef SW_RUNTIME diff --git a/gnuradio-runtime/swig/gr_types.i b/gnuradio-runtime/swig/gr_types.i index 6e24cde90c..8ae953b904 100644 --- a/gnuradio-runtime/swig/gr_types.i +++ b/gnuradio-runtime/swig/gr_types.i @@ -23,7 +23,6 @@ #ifndef SWIG_GR_TYPES_I #define SWIG_GR_TYPES_I -%include "std_string.i" %include "stdint.i" %{ |