comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-01 21:54:39 -04:00
Code Issues Projects Releases Wiki Activity

Winsock.h was included multiple times through windows.h causing compile errors (#772)

Browse Source 
* Prevent redefinition of winsock.

* Remove redundant windows.h import
This commit is contained in:
antihax
2019-12-10 23:50:06 -06:00
committed by Vincent Sonnier
parent 58d3a02855
commit cd6df01166
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/Timer.cpp
+1 -6
View File
@@ -1,13 +1,8 @@
// Copyright (c) Charles J. Cliffe
// SPDX-License-Identifier: GPL-2.0+
#include "Timer.h"
#ifdef _WIN32
#include <windows.h>
#endif
#include <iostream>
#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)
{