diff options
| author | falkTX <falktx@falktx.com> | 2020-06-13 23:09:46 +0100 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2020-06-13 23:09:46 +0100 |
| commit | 8cfc45ba5909297347200a001f59202d4ee71fac (patch) | |
| tree | 2f2e26b997ab58550eb93795a7d385f4118f01f2 /windows | |
| parent | 5f4a57b8ceb1f393d9efb22b231189f5ff4bddb0 (diff) | |
| download | jack2-8cfc45ba5909297347200a001f59202d4ee71fac.tar.gz | |
Include winsock2.h before windows.h, for mingw
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/JackMMCSS.h | 3 | ||||
| -rw-r--r-- | windows/JackRouter/JackRouter.h | 5 | ||||
| -rw-r--r-- | windows/JackShmMem_os.h | 3 | ||||
| -rw-r--r-- | windows/JackSystemDeps_os.h | 3 | ||||
| -rw-r--r-- | windows/JackWinEvent.h | 4 | ||||
| -rw-r--r-- | windows/JackWinNamedPipe.h | 3 | ||||
| -rw-r--r-- | windows/JackWinSemaphore.h | 3 | ||||
| -rw-r--r-- | windows/JackWinThread.h | 3 | ||||
| -rw-r--r-- | windows/winmme/JackWinMMEPort.h | 3 |
9 files changed, 29 insertions, 1 deletions
diff --git a/windows/JackMMCSS.h b/windows/JackMMCSS.h index faf33188..19329aed 100644 --- a/windows/JackMMCSS.h +++ b/windows/JackMMCSS.h @@ -24,6 +24,9 @@ #include "JackSystemDeps.h"
#include "JackCompilerDeps.h"
+#ifdef __MINGW32__
+#include <winsock2.h>
+#endif
#include <windows.h>
#include <map>
diff --git a/windows/JackRouter/JackRouter.h b/windows/JackRouter/JackRouter.h index a50e11a8..c48d8d69 100644 --- a/windows/JackRouter/JackRouter.h +++ b/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"
diff --git a/windows/JackShmMem_os.h b/windows/JackShmMem_os.h index 9f1891f9..aa77de9c 100644 --- a/windows/JackShmMem_os.h +++ b/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) diff --git a/windows/JackSystemDeps_os.h b/windows/JackSystemDeps_os.h index 0f1747a3..d30c9401 100644 --- a/windows/JackSystemDeps_os.h +++ b/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" diff --git a/windows/JackWinEvent.h b/windows/JackWinEvent.h index dadda1c4..503aaaba 100644 --- a/windows/JackWinEvent.h +++ b/windows/JackWinEvent.h @@ -21,6 +21,10 @@ #define __JackWinEvent__ #include "JackSynchro.h" + +#ifdef __MINGW32__ +#include <winsock2.h> +#endif #include <windows.h> namespace Jack diff --git a/windows/JackWinNamedPipe.h b/windows/JackWinNamedPipe.h index 01e971a4..0e3510f7 100644 --- a/windows/JackWinNamedPipe.h +++ b/windows/JackWinNamedPipe.h @@ -21,6 +21,9 @@ #ifndef __JackWinNamedPipe__ #define __JackWinNamedPipe__ +#ifdef __MINGW32__ +#include <winsock2.h> +#endif #include <windows.h> #include "JackChannel.h" diff --git a/windows/JackWinSemaphore.h b/windows/JackWinSemaphore.h index c3871c9a..e125c5b6 100644 --- a/windows/JackWinSemaphore.h +++ b/windows/JackWinSemaphore.h @@ -22,6 +22,9 @@ #define __JackWinSemaphore__ #include "JackSynchro.h" +#ifdef __MINGW32__ +#include <winsock2.h> +#endif #include <windows.h> #include <assert.h> diff --git a/windows/JackWinThread.h b/windows/JackWinThread.h index 106e9963..dcc19e8d 100644 --- a/windows/JackWinThread.h +++ b/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 diff --git a/windows/winmme/JackWinMMEPort.h b/windows/winmme/JackWinMMEPort.h index bfe683b5..e0563f52 100644 --- a/windows/winmme/JackWinMMEPort.h +++ b/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> |