Merge branch 'master' of gnuradio.org:gnuradio

This commit is contained in:
Tom Rondeau 2011-03-25 13:53:09 -04:00
commit 9d9baa5386
3 changed files with 7 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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;