aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2015-04-20 15:50:48 -0700
committerMartin Braun <martin.braun@ettus.com>2015-04-20 16:47:32 -0700
commit63ba4f76a76d9b04d8642abc71f002cb23a8759d (patch)
tree0de4d7502a2faa0aa368e1d6c0e67d0bc1b8afda /host/utils
parenteacd36d94d8d9432c09a8ab79884845efeb5fd4b (diff)
downloaduhd-63ba4f76a76d9b04d8642abc71f002cb23a8759d.tar.gz
uhd-63ba4f76a76d9b04d8642abc71f002cb23a8759d.tar.bz2
uhd-63ba4f76a76d9b04d8642abc71f002cb23a8759d.zip
cmake: Improve usage of C modules
Diffstat (limited to 'host/utils')
-rw-r--r--host/utils/CMakeLists.txt2
-rw-r--r--host/utils/usrp_x3xx_fpga_burner.cpp4
2 files changed, 0 insertions, 6 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index ed8640187..e24b417c1 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -15,8 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-SET(CMAKE_C_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT})
-
########################################################################
# Utilities that get installed into the runtime path
########################################################################
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