diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /usrp/host/lib/db_flexrf.cc | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
Merge branch 'master' into constell_obj
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'usrp/host/lib/db_flexrf.cc')
| -rw-r--r-- | usrp/host/lib/db_flexrf.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usrp/host/lib/db_flexrf.cc b/usrp/host/lib/db_flexrf.cc index 2819c19bd7..ddd87012d3 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 |