diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-30 18:02:02 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-30 18:02:02 -0700 |
| commit | f2337d6fe0cca7337e0678d8f3ee31f657b608f2 (patch) | |
| tree | 98c71da44375cc7c4a299e7ff1f2f70147526e8e /host/utils/usrp_x3xx_fpga_burner.cpp | |
| parent | a7150e25f1ec5802963f44c5f748b211c6fcae8f (diff) | |
| parent | c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2 (diff) | |
| download | uhd-f2337d6fe0cca7337e0678d8f3ee31f657b608f2.tar.gz uhd-f2337d6fe0cca7337e0678d8f3ee31f657b608f2.tar.bz2 uhd-f2337d6fe0cca7337e0678d8f3ee31f657b608f2.zip | |
Merge branch 'master' into vivado
Diffstat (limited to 'host/utils/usrp_x3xx_fpga_burner.cpp')
| -rw-r--r-- | host/utils/usrp_x3xx_fpga_burner.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/host/utils/usrp_x3xx_fpga_burner.cpp b/host/utils/usrp_x3xx_fpga_burner.cpp index e32e4d636..3c6225531 100644 --- a/host/utils/usrp_x3xx_fpga_burner.cpp +++ b/host/utils/usrp_x3xx_fpga_burner.cpp @@ -49,13 +49,9 @@ #include <uhd/utils/safe_main.hpp> #include <uhd/utils/safe_call.hpp> -#ifdef _MSC_VER extern "C" { -#endif #include "cdecode.h" -#ifdef _MSC_VER } -#endif #define X300_FPGA_BIN_SIZE_BYTES 15877916 #define X300_FPGA_BIT_MAX_SIZE_BYTES 15878022 |