From cd6df01166ee8f257a1df9980910a4ba8638ebe5 Mon Sep 17 00:00:00 2001 From: antihax Date: Tue, 10 Dec 2019 23:50:06 -0600 Subject: [PATCH] Winsock.h was included multiple times through windows.h causing compile errors (#772) * Prevent redefinition of winsock. * Remove redundant windows.h import --- CMakeLists.txt | 8 ++++---- src/util/Timer.cpp | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d37b59..f5e6eaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -688,13 +688,13 @@ ENDIF (NOT BUNDLE_APP) IF (MSVC) set_target_properties(CubicSDR PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS") - set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_DEBUG "_WINDOWS") + set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_DEBUG "_WINDOWS;WIN32_LEAN_AND_MEAN") set_target_properties(CubicSDR PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS") - set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_WINDOWS") + set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_WINDOWS;WIN32_LEAN_AND_MEAN") set_target_properties(CubicSDR PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") - set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_RELEASE "_WINDOWS") + set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_RELEASE "_WINDOWS;WIN32_LEAN_AND_MEAN") set_target_properties(CubicSDR PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS") - set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_MINSIZEREL "_WINDOWS") + set_target_properties(CubicSDR PROPERTIES COMPILE_DEFINITIONS_MINSIZEREL "_WINDOWS;WIN32_LEAN_AND_MEAN") set(CMAKE_CREATE_WIN32_EXE "/SUBSYSTEM:WINDOWS /ENTRY:\"mainCRTStartup\"") set_target_properties (CubicSDR PROPERTIES OUTPUT_NAME "${CUBICSDR_INSTALL_NAME}") diff --git a/src/util/Timer.cpp b/src/util/Timer.cpp index 385681e..74bd5b6 100644 --- a/src/util/Timer.cpp +++ b/src/util/Timer.cpp @@ -1,13 +1,8 @@ // Copyright (c) Charles J. Cliffe // SPDX-License-Identifier: GPL-2.0+ -#include "Timer.h" - -#ifdef _WIN32 - #include -#endif - #include +#include "Timer.h" Timer::Timer(void) : time_elapsed(0), system_milliseconds(0), start_time(0), end_time(0), last_update(0), num_updates(0), paused_time(0), offset(0), paused_state(false), lock_state(false), lock_rate(0) {