summaryrefslogtreecommitdiff
path: root/gr-usrp/src
diff options
context:
space:
mode:
authorTom Rondeau2011-03-25 13:53:09 -0400
committerTom Rondeau2011-03-25 13:53:09 -0400
commit8cee6c5ffb0605273c8b73891851ba3f991b0622 (patch)
treea3bd421c8fddaec15484d4d653811974c8d5969a /gr-usrp/src
parent972fc99ad6984e50731ec0dd97ccfec71829139b (diff)
parent64dac6a1f62fb8484e879f0d20ee60bc02da179c (diff)
downloadgnuradio-8cee6c5ffb0605273c8b73891851ba3f991b0622.tar.gz
gnuradio-8cee6c5ffb0605273c8b73891851ba3f991b0622.tar.bz2
gnuradio-8cee6c5ffb0605273c8b73891851ba3f991b0622.zip
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-usrp/src')
-rw-r--r--gr-usrp/src/Makefile.am1
-rw-r--r--gr-usrp/src/usrp_swig.i1
2 files changed, 2 insertions, 0 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index a0c6b7a82..29cedc96a 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -86,6 +86,7 @@ usrp_swig_pythondir_category = \
# additional arguments to the SWIG command
usrp_swig_swig_args = \
+ $(DEFAULT_INCLUDES) \
$(USRP_INCLUDES)
# additional libraries for linking with the SWIG-generated library
diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index b1797d758..80d59abc9 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -23,6 +23,7 @@
%include "gnuradio.i" // the common stuff
%{
+#include "config.h" // for NOMINMAX
#include <vector>
%}