fix build with MinGW

FluidSynth · Feb 22, 2019 · 9671e41 · 9671e41
1 parent 9ca9a57
commit 9671e41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/utils/fluid_sys.c b/src/utils/fluid_sys.c
@@ -30,6 +30,12 @@
 #include "fluid_rtkit.h"
 #endif
 
+#if HAVE_PTHREAD_H && !defined(WIN32)
+// Do not include pthread on windows. It includes winsock.h, which collides with ws2tcpip.h from fluid_sys.h
+// It isn't need on Windows anyway.
+#include <pthread.h>
+#endif
+
 /* WIN32 HACK - Flag used to differentiate between a file descriptor and a socket.
  * Should work, so long as no SOCKET or file descriptor ends up with this bit set. - JG */
 #ifdef _WIN32

diff --git a/src/utils/fluid_sys.h b/src/utils/fluid_sys.h
@@ -97,10 +97,6 @@
 #include <limits.h>
 #endif
 
-#if HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
 #if HAVE_OPENMP
 #include <omp.h>
 #endif