Include winsock2.h before windows.h, for mingw

windows/JackMMCSS.h

@@ -24,6 +24,9 @@
 
 #include "JackSystemDeps.h"
 #include "JackCompilerDeps.h"
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #include <map>
 

windows/JackRouter/JackRouter.h

@@ -37,10 +37,13 @@ static int	kNumOutputs = 4;
 #include "jack.h"
 #include "rpc.h"
 #include "rpcndr.h"
+
 #ifndef COM_NO_WINDOWS_H
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #include "ole2.h"
-
 #endif
 
 #include "combase.h"

windows/JackShmMem_os.h

@@ -20,6 +20,9 @@
 #ifndef __JackShmMem_WIN32__
 #define __JackShmMem_WIN32__
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 
 inline bool CHECK_MLOCK(void* ptr, size_t size)

windows/JackSystemDeps_os.h

@@ -21,6 +21,9 @@
 #ifndef __JackSystemDeps_WIN32__
 #define __JackSystemDeps_WIN32__
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #include "JackCompilerDeps.h"
 

windows/JackWinEvent.h

@@ -21,6 +21,10 @@
 #define __JackWinEvent__
 
 #include "JackSynchro.h"
+
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 
 namespace Jack

windows/JackWinNamedPipe.h

@@ -21,6 +21,9 @@
 #ifndef __JackWinNamedPipe__
 #define __JackWinNamedPipe__
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 
 #include "JackChannel.h"

windows/JackWinSemaphore.h

@@ -22,6 +22,9 @@
 #define __JackWinSemaphore__
 
 #include "JackSynchro.h"
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #include <assert.h>
 

windows/JackWinThread.h

@@ -24,6 +24,9 @@
 #include "JackMMCSS.h"
 #include "JackCompilerDeps.h"
 #include "JackSystemDeps.h"
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 
 namespace Jack

windows/winmme/JackWinMMEPort.h

@@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackWinMMEPort__
 #define __JackWinMMEPort__
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #include <mmsystem.h>