From e1aa3c234fcc30c5c07f4b896adf304414558604 Mon Sep 17 00:00:00 2001 From: Cedric Vivier Date: Mon, 30 Aug 2010 10:40:39 -0700 Subject: [PATCH] i965: Apply the rest of the old-libdrm guard patch. Bug #29855 --- src/mesa/drivers/dri/intel/intel_context.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index f245ba843bd..28d53284fdf 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 -- 2.30.2