diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /usrp/host/lib | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
Diffstat (limited to 'usrp/host/lib')
| -rw-r--r-- | usrp/host/lib/db_flexrf.cc | 3 | ||||
| -rw-r--r-- | usrp/host/lib/db_wbxng.cc | 3 | ||||
| -rw-r--r-- | usrp/host/lib/fusb_win32.cc | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/usrp/host/lib/db_flexrf.cc b/usrp/host/lib/db_flexrf.cc index 2819c19bd..ddd87012d 100644 --- a/usrp/host/lib/db_flexrf.cc +++ b/usrp/host/lib/db_flexrf.cc @@ -24,6 +24,9 @@ #include <usrp/db_flexrf.h> #include <db_base_impl.h> +#ifdef HAVE_TIME_H +#include <ctime> +#endif // d'board i/o pin defs // Tx and Rx have shared defs, but different i/o regs diff --git a/usrp/host/lib/db_wbxng.cc b/usrp/host/lib/db_wbxng.cc index 89200653e..4d17c72d1 100644 --- a/usrp/host/lib/db_wbxng.cc +++ b/usrp/host/lib/db_wbxng.cc @@ -26,6 +26,9 @@ #include "db_wbxng_adf4350.h" #include <db_base_impl.h> #include <stdio.h> +#ifdef HAVE_TIME_H +#include <ctime> +#endif // d'board i/o pin defs // Tx and Rx have shared defs, but different i/o regs diff --git a/usrp/host/lib/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc index 8900576d9..8c218534b 100644 --- a/usrp/host/lib/fusb_win32.cc +++ b/usrp/host/lib/fusb_win32.cc @@ -29,6 +29,7 @@ #include <assert.h> #include <stdexcept> #include <string.h> +#include <cstdio> static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; |