Module: Mesa
Branch: master
Commit: 4f8e38dab88378b0b5f822893dae5b791e53fb46
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f8e38dab88378b0b5f822893dae5b791e53fb46
Author: Luca Barbieri <l...@luca-barbieri.com>
Date: Wed Sep 22 19:04:36 2010 +0200
d3d1x: fix GUID declarations
---
.../d3d1x/d3d1xstutil/include/d3d1xstutil.h | 9 +++++----
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 6c13a9c..83cf0f2 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>
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
