From 4f8e38dab88378b0b5f822893dae5b791e53fb46 Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed, 22 Sep 2010 19:04:36 +0200
Subject: [PATCH] d3d1x: fix GUID declarations

---
 .../d3d1x/d3d1xstutil/include/d3d1xstutil.h              | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index 6c13a9ccb4e..83cf0f2c3e4 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
@@ -42,22 +42,23 @@ namespace std
 #include <utility>
 
 #define WIN32_LEAN_AND_MEAN
-#include <objbase.h>
+#define INITGUID
 #include <guiddef.h>
-#include <specstrings.h>
 
+// just replicate GUIDs in every object file to avoid the hassle of having to pull in a library for them
 #ifdef __GNUC__
 #define ATTRIBUTE_UNUSED __attribute__((unused))
 #else
 #define ATTRIBUTE_UNUSED
 #endif
-
-// just replicate GUIDs in every object file to avoid the hassle of having to pull in a library for them
 #undef DEFINE_GUID
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
         static const GUID name ATTRIBUTE_UNUSED = \
 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 
+#include <objbase.h>
+#include <specstrings.h>
+
 #include "galliumdxgi.h"
 #include <d3dcommon.h>
 
-- 
2.30.2