From: Eric Anholt <eric@anholt.net>
Date: Thu, 26 Aug 2010 22:43:00 +0000 (-0700)
Subject: i965: Hack in avoidance of c++ reserved keyword in libdrm.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa2deb3ddc8dc9e3eedf7f3dc1d2d2945a95f79b;p=mesa.git

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.
---

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"