Mesa (master): i965: Apply the rest of the old-libdrm guard patch.

[Eric Anholt]

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

Author: Cedric Vivier <cedricv at neonux.com>
Date:   Mon Aug 30 10:40:39 2010 -0700

i965: Apply the rest of the old-libdrm guard patch.

Bug #29855

---

 src/mesa/drivers/dri/intel/intel_context.h |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index f245ba8..28d5328 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -33,12 +33,25 @@
 #include "main/mtypes.h"
 #include "main/mm.h"
 #include "dri_metaops.h"
+
+#ifdef __cplusplus
+extern "C" {
+	/* Evil hack for using libdrm in a c++ compiler. */
+	#define virtual virt
+#endif
+
 #include "drm.h"
 #include "intel_bufmgr.h"
 
 #include "intel_screen.h"
 #include "intel_tex_obj.h"
 #include "i915_drm.h"
+
+#ifdef __cplusplus
+	#undef virtual
+}
+#endif
+
 #include "tnl/t_vertex.h"
 
 #define TAG(x) intel##x