diff options
| author | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /usrp | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
| download | gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.gz gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.bz2 gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.zip | |
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')
| -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 | ||||
| -rw-r--r-- | usrp/host/misc/Makefile.am | 2 | ||||
| -rw-r--r-- | usrp/host/swig/usrp_prims.i | 1 |
5 files changed, 8 insertions, 2 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; diff --git a/usrp/host/misc/Makefile.am b/usrp/host/misc/Makefile.am index 935dc74b5..d238311e3 100644 --- a/usrp/host/misc/Makefile.am +++ b/usrp/host/misc/Makefile.am @@ -24,10 +24,8 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST += \ getopt.c getopt.h \ gettimeofday.c \ - tempname.c mkstemp.c \ usleep.c noinst_LTLIBRARIES = libmisc.la libmisc_la_SOURCES = bug_work_around_8.cc -libmisc_la_LIBADD = @LTLIBOBJS@ diff --git a/usrp/host/swig/usrp_prims.i b/usrp/host/swig/usrp_prims.i index 0476858da..a58f8aacf 100644 --- a/usrp/host/swig/usrp_prims.i +++ b/usrp/host/swig/usrp_prims.i @@ -37,6 +37,7 @@ %{ #include <usrp/usrp_prims.h> +#include <stddef.h> // ptrdiff_t %} |