From d52cb3708bd3a05f19e4fecbe29ac6f301b2d0b2 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 6 Oct 2012 21:30:03 -0700
Subject: [PATCH] Include windows.h before cpuid.h to avoid __cpuid clashes

---
 Alc/helpers.c | 34 +++++++++++++++++-----------------
 config.h.in   | 15 +++++++++------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Alc/helpers.c b/Alc/helpers.c
index 03672a17..2143a4c8 100644
--- a/Alc/helpers.c
+++ b/Alc/helpers.c
@@ -20,23 +20,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
-#include <stdarg.h>
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-#ifdef HAVE_CPUID_H
-#include <cpuid.h>
-#endif
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
 #if defined(HAVE_GUIDDEF_H) || defined(HAVE_INITGUID_H)
 #define INITGUID
 #include <windows.h>
@@ -64,6 +47,23 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80,
 
 #endif
 
+#include <stdlib.h>
+#include <time.h>
+#include <errno.h>
+#include <stdarg.h>
+#ifdef HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+#ifdef HAVE_CPUID_H
+#include <cpuid.h>
+#endif
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
 #include "alMain.h"
 
 ALuint CPUCapFlags = 0;
diff --git a/config.h.in b/config.h.in
index 750fcfab..75d7a790 100644
--- a/config.h.in
+++ b/config.h.in
@@ -61,9 +61,6 @@
 /* Define if we have the Wave Writer backend */
 #cmakedefine HAVE_WAVE
 
-/* Define if we have dlfcn.h */
-#cmakedefine HAVE_DLFCN_H
-
 /* Define if we have the stat function */
 #cmakedefine HAVE_STAT
 
@@ -106,9 +103,6 @@
 /* Define if we have the strtof function */
 #cmakedefine HAVE_STRTOF
 
-/* Define if we have stdint.h */
-#cmakedefine HAVE_STDINT_H
-
 /* Define if we have the __int64 type */
 #cmakedefine HAVE___INT64
 
@@ -124,6 +118,15 @@
 /* Define if we have GCC's format attribute */
 #cmakedefine HAVE_GCC_FORMAT
 
+/* Define if we have stdint.h */
+#cmakedefine HAVE_STDINT_H
+
+/* Define if we have windows.h */
+#cmakedefine HAVE_WINDOWS_H
+
+/* Define if we have dlfcn.h */
+#cmakedefine HAVE_DLFCN_H
+
 /* Define if we have pthread_np.h */
 #cmakedefine HAVE_PTHREAD_NP_H
 
-- 
2.11.4.GIT