Winsock.h was included multiple times through windows.h causing compi…

…le errors.
cjcliffe · Dec 9, 2019 · d06db02 · d06db02
1 parent 31323fe
commit d06db02
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/external/rtaudio/RtAudio.cpp b/external/rtaudio/RtAudio.cpp
@@ -5494,7 +5494,6 @@ void RtApiWasapi::wasapiThread()
 // Various revisions for RtAudio 4.0 by Gary Scavone, April 2007
 // Changed device query structure for RtAudio 4.0.7, January 2010
 
-#include <windows.h>
 #include <process.h>
 #include <mmsystem.h>
 #include <mmreg.h>

diff --git a/external/rtaudio/RtAudio.h b/external/rtaudio/RtAudio.h
@@ -621,6 +621,8 @@ class RTAUDIO_DLL_PUBLIC RtAudio
   #ifndef NOMINMAX
     #define NOMINMAX
   #endif
+
+  #define _WINSOCKAPI_
   #include <windows.h>
   #include <process.h>
   #include <stdint.h>

diff --git a/external/tinyxml/tinyxmlparser.cpp b/external/tinyxml/tinyxmlparser.cpp
@@ -30,6 +30,7 @@ distribution.
 //#define DEBUG_PARSER
 #if defined( DEBUG_PARSER )
 #	if defined( DEBUG ) && defined( _MSC_VER )
+#		define _WINSOCKAPI_
 #		include <windows.h>
 #		define TIXML_LOG OutputDebugString
 #	else

diff --git a/src/util/GLExt.h b/src/util/GLExt.h
@@ -6,6 +6,7 @@
 #include "wx/glcanvas.h"
 
 #ifdef _WIN32
+#define _WINSOCKAPI_
 #include <windows.h>
 #ifdef __MINGW32__
 #include <gl/wglext.h>

diff --git a/src/util/Timer.cpp b/src/util/Timer.cpp
@@ -3,10 +3,6 @@
 
 #include "Timer.h"
 
-#ifdef _WIN32
-    #include <windows.h>
-#endif
-
 #include <iostream>
 
 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)

diff --git a/src/util/Timer.h b/src/util/Timer.h
@@ -5,6 +5,7 @@
 #define TIMER_H
 
 #ifdef WIN32
+#define _WINSOCKAPI_
 #include <windows.h>
 #else
 #include <sys/time.h>