2 more winsock.h includes, also set PRIu64 for mingw

jackaudio · Jun 13, 2020 · a11c699 · a11c699
1 parent 8cfc45b
commit a11c699
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/windows/JackTypes_os.h b/windows/JackTypes_os.h
@@ -21,12 +21,19 @@
 #ifndef __JackTypes_WIN32__
 #define __JackTypes_WIN32__
 
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 
-typedef ULONGLONG UInt64;
+typedef ULONGLONG UInt64;
 typedef UInt64 uint64_t;
 typedef unsigned short uint16_t;
-typedef DWORD jack_tls_key;
+typedef DWORD jack_tls_key;
+
+#if defined(__MINGW32__)
+#define PRIu64 "llu"
+#endif
 
 #endif
 
diff --git a/windows/JackWinMutex.h b/windows/JackWinMutex.h
@@ -23,6 +23,9 @@
 
 #include "JackCompilerDeps.h"
 #include "JackException.h"
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #include <stdio.h>
 
@@ -71,13 +74,13 @@ class SERVER_EXPORT JackWinMutex
 
         JackWinMutex(const char* name = NULL)
         {
-            // In recursive mode by default
+            // In recursive mode by default
             if (name) {
                 char buffer[MAX_PATH];
                 snprintf(buffer, sizeof(buffer), "%s_%s", "JackWinMutex", name);
-                fMutex = CreateMutex(NULL, FALSE, buffer);
-            } else {
-                fMutex = CreateMutex(NULL, FALSE, NULL);
+                fMutex = CreateMutex(NULL, FALSE, buffer);
+            } else {
+                fMutex = CreateMutex(NULL, FALSE, NULL);
             }
 
             ThrowIf((fMutex == 0), JackException("JackWinMutex: could not init the mutex"));