summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-08-26 15:43:00 -0700
committerEric Anholt <[email protected]>2010-08-26 15:43:36 -0700
commitfa2deb3ddc8dc9e3eedf7f3dc1d2d2945a95f79b (patch)
treed565152d6f98aec681a6497ddfbb9dd472dce8f2 /src/mesa
parent363d0f6774b4c6b825f5b903284da1cd51a91986 (diff)
i965: Hack in avoidance of c++ reserved keyword in libdrm.
I'm also fixing this upstream in libdrm, but this avoids new libdrm dependency for the moment.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 640f797e9e6..11c79b11bfc 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -26,6 +26,14 @@
*/
extern "C" {
+
+#include <sys/types.h>
+/* Evil hack for using libdrm in a c++ compiler. */
+#define virtual virt
+#include "i915_drm.h"
+#include "intel_bufmgr.h"
+#undef virtual
+
#include "main/macros.h"
#include "main/shaderobj.h"
#include "program/prog_parameter.h"