aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlam Arias <[email protected]>2009-06-07 22:11:46 -0400
committerChris Robinson <[email protected]>2009-06-07 19:43:42 -0700
commit89e9437b8417701eb4b9ed28984687221712108c (patch)
tree96cdd2a2170afc9aef45847b38673beb70461221
parent1454c46b5fed42dca9d509a66d4cefac2800289c (diff)
add check for _WAVEFORMATEXTENSIBLE_ and define _WIN32_IE before inlcuding any header
-rw-r--r--Alc/alcConfig.c7
-rw-r--r--Alc/dsound.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/Alc/alcConfig.c b/Alc/alcConfig.c
index 6b959709..aa6ed21e 100644
--- a/Alc/alcConfig.c
+++ b/Alc/alcConfig.c
@@ -18,6 +18,10 @@
* Or go to http://www.gnu.org/copyleft/lgpl.html
*/
+#ifdef _WIN32
+#define _WIN32_IE 0x400
+#endif
+
#include "config.h"
#include <stdlib.h>
@@ -27,8 +31,7 @@
#include "alMain.h"
-#ifdef _WIN32
-#define _WIN32_IE 0x400
+#ifdef _WIN32_IE
#include <shlobj.h>
#endif
diff --git a/Alc/dsound.c b/Alc/dsound.c
index 11cce150..2329a4d7 100644
--- a/Alc/dsound.c
+++ b/Alc/dsound.c
@@ -28,6 +28,10 @@
#include <dsound.h>
#include <mmreg.h>
+#ifndef _WAVEFORMATEXTENSIBLE_
+#include <ks.h>
+#include <ksmedia.h>
+#endif
#include "alMain.h"
#include "AL/al.h"