summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorLuca Barbieri <[email protected]>2010-09-22 19:04:36 +0200
committerLuca Barbieri <[email protected]>2010-09-22 19:36:27 +0200
commit4f8e38dab88378b0b5f822893dae5b791e53fb46 (patch)
tree65484e685649a433f6d7bfeb6a5b6bef257cc84c /src/gallium
parent6ce098631abf465e89b12d10c4e6713b9c843422 (diff)
d3d1x: fix GUID declarations
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h9
1 files 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>