From ab5e9a726d50b414718a248fd8625f1c6f269a49 Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed, 22 Sep 2010 19:31:54 +0200
Subject: [PATCH] d3d1x: define GUIDs in the normal way

---
 .../state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h | 14 --------------
 .../state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp   |  1 -
 .../state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp   |  1 -
 3 files changed, 16 deletions(-)

diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index 83cf0f2..7627720 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
@@ -42,20 +42,6 @@ namespace std
 #include <utility>
 
 #define WIN32_LEAN_AND_MEAN
-#define INITGUID
-#include <guiddef.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
-#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>
 
diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
index ddba685..0fcef0d 100755
--- a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
@@ -24,7 +24,6 @@
  *
  **************************************************************************/
 
-#define INITGUID
 #include "d3d10app.h"
 #include <X11/Xlib.h>
 #include <GL/glx.h>
diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
index 7e1edeb..7055da9 100755
--- a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
@@ -1,4 +1,3 @@
-#define INITGUID
 #include "d3d11app.h"
 #include <X11/Xlib.h>
 #include <GL/glx.h>
-- 
2.7.4