update

Author: dimitre

addons/ofxNetwork/src/ofxNetworkUtils.h

@@ -8,8 +8,6 @@
 #pragma once
 
 #include <cerrno>
-#include "ofConstants.h"
-
 
 #ifdef TARGET_WIN32
 #include <WinSock2.h>
@@ -19,6 +17,10 @@
 #define OFXNETWORK_ERROR(name)	E ## name
 #endif
 
+// WinSock2.h has to be included before windows.h
+#include "ofConstants.h"
+
+
 /**
  * @brief Log the latest network error and where it happened (file and line)
  * 

addons/ofxNetwork/src/ofxTCPManager.h

@@ -42,7 +42,6 @@ SetTimeoutAccept()
 SetTimeoutReceive()
 
 ****************************************************************/
-#include "ofConstants.h"
 #include <string.h>
 #include <wchar.h>
 #include <stdio.h>
@@ -82,6 +81,10 @@ SetTimeoutReceive()
 	#include <ws2tcpip.h>		// TCP/IP annex needed for multicasting
 #endif
 
+// windows.h after winsock2.h
+#include "ofConstants.h"
+
+
 //--------------------------------------------------------------------------------
 class InetAddr : public sockaddr_in
 {

addons/ofxNetwork/src/ofxUDPManager.h

@@ -62,11 +62,7 @@ UDP Multicast (receiving):
 x) Close()
 
 --------------------------------------------------------------------------------*/
-#include "ofConstants.h"
-#include "ofxUDPSettings.h"
-#include <string.h>
-#include <wchar.h>
-#include <stdio.h>
+
 
 #ifndef TARGET_WIN32
 
@@ -104,6 +100,11 @@ x) Close()
 /// Socket constants.
 #define SOCKET_TIMEOUT			SOCKET_ERROR - 1
 
+#include "ofConstants.h"
+#include "ofxUDPSettings.h"
+#include <string.h>
+#include <wchar.h>
+#include <stdio.h>
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------