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/db_dbs_rx.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/db_dbs_rx.cc')
| -rw-r--r-- | usrp/host/lib/db_dbs_rx.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usrp/host/lib/db_dbs_rx.cc b/usrp/host/lib/db_dbs_rx.cc index 99f66c785..7fe8c4951 100644 --- a/usrp/host/lib/db_dbs_rx.cc +++ b/usrp/host/lib/db_dbs_rx.cc @@ -1,5 +1,5 @@ // -// Copyright 2008 Free Software Foundation, Inc. +// Copyright 2008,2009 Free Software Foundation, Inc. // // This file is part of GNU Radio // @@ -18,6 +18,10 @@ // the Free Software Foundation, Inc., 51 Franklin Street, // Boston, MA 02110-1301, USA. +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <usrp/db_dbs_rx.h> #include <db_base_impl.h> #include <cmath> |