diff options
| author | Tom | 2009-10-06 10:40:39 -0700 |
|---|---|---|
| committer | Tom | 2009-10-06 10:40:39 -0700 |
| commit | bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef (patch) | |
| tree | dbf63fb638238e389ad970f2f4443299491e8fc6 /usrp/host/lib/usrp_standard.cc | |
| parent | 314726ae7457b37f442a2751285b75b0d616c0f4 (diff) | |
| parent | 3f8026a00c261c788357b3a04f5b338a6cda4d0e (diff) | |
| download | gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.tar.gz gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.tar.bz2 gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.zip | |
Merge branch 'master' into sync
Conflicts:
gr-utils/src/python/gr_plot_qt.py
gr-utils/src/python/pyqt_plot.py
gr-utils/src/python/pyqt_plot.ui
Diffstat (limited to 'usrp/host/lib/usrp_standard.cc')
| -rw-r--r-- | usrp/host/lib/usrp_standard.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usrp/host/lib/usrp_standard.cc b/usrp/host/lib/usrp_standard.cc index b112dbe0c..541dd3f57 100644 --- a/usrp/host/lib/usrp_standard.cc +++ b/usrp/host/lib/usrp_standard.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <usrp/usrp_standard.h> #include "usrp/usrp_prims.h" |