This makes windows.h include less headers. Otherwise boolean is typedef'ed and that clashes with libjson. --- src/modules/module-waveout.c | 1 + src/pulse/mainloop-signal.c | 1 + src/pulse/timeval.c | 1 + src/pulse/util.c | 1 + src/pulsecore/core-rtclock.c | 1 + src/pulsecore/core-scache.c | 1 + src/pulsecore/core-util.c | 1 + src/pulsecore/dllmain.c | 2 ++ src/pulsecore/mutex-win32.c | 1 + src/pulsecore/pid.c | 1 + src/pulsecore/random.c | 1 + src/pulsecore/semaphore-win32.c | 1 + src/pulsecore/thread-win32.c | 1 + 13 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c index 9f119c5..371d53d 100644 --- a/src/modules/module-waveout.c +++ b/src/modules/module-waveout.c @@ -24,6 +24,7 @@ #include <config.h> #endif +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <mmsystem.h> diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c index 70c0122..529b8e6 100644 --- a/src/pulse/mainloop-signal.c +++ b/src/pulse/mainloop-signal.c @@ -33,6 +33,7 @@ #include <fcntl.h> #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulse/timeval.c b/src/pulse/timeval.c index 10ba322..83d3881 100644 --- a/src/pulse/timeval.c +++ b/src/pulse/timeval.c @@ -28,6 +28,7 @@ #include <sys/time.h> #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulse/util.c b/src/pulse/util.c index 48ccf29..5d073b0 100644 --- a/src/pulse/util.c +++ b/src/pulse/util.c @@ -42,6 +42,7 @@ #endif #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c index 6632cc6..5dc75f5 100644 --- a/src/pulsecore/core-rtclock.c +++ b/src/pulsecore/core-rtclock.c @@ -45,6 +45,7 @@ #endif #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c index 1aed907..0550711 100644 --- a/src/pulsecore/core-scache.c +++ b/src/pulsecore/core-scache.c @@ -39,6 +39,7 @@ #endif #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 6902ee9..72b79d1 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -86,6 +86,7 @@ #endif #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c index c826bc0..e404ddd 100644 --- a/src/pulsecore/dllmain.c +++ b/src/pulsecore/dllmain.c @@ -29,7 +29,9 @@ #include <stdio.h> #include <string.h> +#define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <winsock2.h> extern pa_win32_get_toplevel(HANDLE handle); diff --git a/src/pulsecore/mutex-win32.c b/src/pulsecore/mutex-win32.c index f4652a9..e283a0b 100644 --- a/src/pulsecore/mutex-win32.c +++ b/src/pulsecore/mutex-win32.c @@ -23,6 +23,7 @@ #include <config.h> #endif +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <pulse/xmalloc.h> diff --git a/src/pulsecore/pid.c b/src/pulsecore/pid.c index cb50077..3a7cfe1 100644 --- a/src/pulsecore/pid.c +++ b/src/pulsecore/pid.c @@ -36,6 +36,7 @@ #include <signal.h> #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c index bdbc143..cda009b 100644 --- a/src/pulsecore/random.c +++ b/src/pulsecore/random.c @@ -32,6 +32,7 @@ #include <time.h> #ifdef HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <wincrypt.h> #endif diff --git a/src/pulsecore/semaphore-win32.c b/src/pulsecore/semaphore-win32.c index c2e00c6..f40630e 100644 --- a/src/pulsecore/semaphore-win32.c +++ b/src/pulsecore/semaphore-win32.c @@ -23,6 +23,7 @@ #include <config.h> #endif +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <pulse/xmalloc.h> diff --git a/src/pulsecore/thread-win32.c b/src/pulsecore/thread-win32.c index 7d458b9..a20f0f8 100644 --- a/src/pulsecore/thread-win32.c +++ b/src/pulsecore/thread-win32.c @@ -25,6 +25,7 @@ #include <stdio.h> +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <pulse/xmalloc.h> -- 1.7.4.1
