aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2012-10-06 21:36:15 -0700
committerChris Robinson <[email protected]>2012-10-06 21:36:15 -0700
commit9501f1cb9eec4e042f1f6c918ceae5c832a9cd5a (patch)
tree871c3c1a71d69d252c02b1dbb9587191c13079a1
parentd52cb3708bd3a05f19e4fecbe29ac6f301b2d0b2 (diff)
Define WIN32_LEAN_AND_MEAN when including windows.h in alMain.h
-rw-r--r--Alc/backends/null.c3
-rw-r--r--Alc/backends/wave.c3
-rw-r--r--OpenAL32/Include/alMain.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/Alc/backends/null.c b/Alc/backends/null.c
index 0b58310a..93b38063 100644
--- a/Alc/backends/null.c
+++ b/Alc/backends/null.c
@@ -21,6 +21,9 @@
#include "config.h"
#include <stdlib.h>
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
#include "alMain.h"
#include "alu.h"
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index ecbfde66..38932819 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -23,6 +23,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <memory.h>
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
#include "alMain.h"
#include "alu.h"
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 8b0850de..ba6a5c8b 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -107,6 +107,7 @@ static const union {
#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
typedef DWORD pthread_key_t;