diff options
| author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-06-07 23:46:08 +0200 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-06-12 11:14:59 -0700 |
| commit | fc0eebf2c4701c9747cb678ee7592d58a9943d1d (patch) | |
| tree | b66dfd8088df711f973b46b61dc3dd877f9a1fdc | |
| parent | 6fd2ef48ddd2836fa6ab2c553ac36ff34306e5a9 (diff) | |
win32: define WIN32_LEAN_AND_MEAN
This makes windows.h include less headers.
Otherwise boolean is typedef'ed and that clashes with libjson.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/pulsecore/dllmain.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9d388ef3..56d4e632 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,9 @@ case $host in *-*-darwin* ) AC_DEFINE([_DARWIN_C_SOURCE], [200112L], [Needed to get NSIG on Mac OS X]) ;; + *-*-mingw* ) + AC_DEFINE([WIN32_LEAN_AND_MEAN], 1, [Needed to avoid including unnecessary headers]) + ;; esac # M4 diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c index c826bc08..cb88c928 100644 --- a/src/pulsecore/dllmain.c +++ b/src/pulsecore/dllmain.c @@ -30,6 +30,7 @@ #include <string.h> #include <windows.h> +#include <winsock2.h> extern pa_win32_get_toplevel(HANDLE handle); |