diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-23 12:19:18 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-23 12:19:18 -0700 |
| commit | 5b087a0802a690775536b0101b6881c05b135c42 (patch) | |
| tree | f015c1fde687602aaf0664a57ae14654003a3919 /host/utils/usrp_x3xx_fpga_burner.cpp | |
| parent | 0a103ba2bad243652e8c57732190a18a2ee31d38 (diff) | |
| parent | 4e8f0817001d14a9eb2b85f042f185b0c802b6ed (diff) | |
| download | uhd-5b087a0802a690775536b0101b6881c05b135c42.tar.gz uhd-5b087a0802a690775536b0101b6881c05b135c42.tar.bz2 uhd-5b087a0802a690775536b0101b6881c05b135c42.zip | |
Merge branch 'maint' into mwest/b200_rev5
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 |