Alexandre Julliard : mmdevapi: Include system headers before Wine headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a7d000e2e2d86a1fb7e635662fb1fcb461f1f4e9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a7d000e2e2d86a1fb7e635662f...

Author: Alexandre Julliard 
Date:   Mon Apr  5 17:44:23 2010 +0200

mmdevapi: Include system headers before Wine headers.

---

dlls/mmdevapi/devenum.c  |   10 +++++++++-
 dlls/mmdevapi/main.c     |    8 ++++++++
 dlls/mmdevapi/mmdevapi.h |   13 ++++---------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index 362855e..b593eb6 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -16,11 +16,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define NONAMELESSUNION
 #include "config.h"

#include <stdarg.h>

+#ifdef HAVE_AL_AL_H
+#include <AL/al.h>
+#include <AL/alc.h>
+#elif defined(HAVE_OPENAL_AL_H)
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#endif
+
+#define NONAMELESSUNION
 #define CINTERFACE
 #define COBJMACROS
 #include "windef.h"
diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index d9536aa..0467963 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -21,6 +21,14 @@

#include <stdarg.h>

+#ifdef HAVE_AL_AL_H
+#include <AL/al.h>
+#include <AL/alc.h>
+#elif defined(HAVE_OPENAL_AL_H)
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#endif
+
 #define CINTERFACE
 #define COBJMACROS
 #include "windef.h"
diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h
index 310c9f1..bcca85e 100644
--- a/dlls/mmdevapi/mmdevapi.h
+++ b/dlls/mmdevapi/mmdevapi.h
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
 extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv);
 extern void MMDevEnum_Free(void);

@@ -37,15 +41,6 @@ typedef struct MMDevice {

#ifdef HAVE_OPENAL

-#ifdef HAVE_AL_AL_H
-#include <AL/al.h>
-#include <AL/alc.h>
-#elif defined(HAVE_OPENAL_AL_H)
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
-#else
-#error No OpenAL headers found?
-#endif
 #include "alext.h"

/* All openal functions */