zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-26 13:50:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix build with MinGW

Browse source
This commit is contained in:
derselbst 2019-02-22 10:15:18 +01:00
parent 9ca9a57a1f
commit 9671e412fe
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/utils/fluid_sys.c
View file

@ -30,6 +30,12 @@
#include "fluid_rtkit.h" #include "fluid_rtkit.h"
#endif #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. /* 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 */ * Should work, so long as no SOCKET or file descriptor ends up with this bit set. - JG */
#ifdef _WIN32 #ifdef _WIN32

4
src/utils/fluid_sys.h
View file

@ -97,10 +97,6 @@
#include <limits.h> #include <limits.h>
#endif #endif
#if HAVE_PTHREAD_H
#include <pthread.h>
#endif
#if HAVE_OPENMP #if HAVE_OPENMP
#include <omp.h> #include <omp.h>
#endif #endif