Mesa (master): i965: Hack in avoidance of c++ reserved keyword in libdrm.

Eric Anholt anholt at kemper.freedesktop.org
Thu Aug 26 22:44:32 UTC 2010


Module: Mesa
Branch: master
Commit: fa2deb3ddc8dc9e3eedf7f3dc1d2d2945a95f79b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa2deb3ddc8dc9e3eedf7f3dc1d2d2945a95f79b

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Aug 26 15:43:00 2010 -0700

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.

---

 src/mesa/drivers/dri/i965/brw_fs.cpp |    8 ++++++++
 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 640f797..11c79b1 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"




More information about the mesa-commit mailing list