From 0e74f390d9ed1125321fa2fab4da629a521baede Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 16 Feb 2017 15:16:42 +0000 Subject: [PATCH] i915: remove 'virtual' and extern C workarounds Analogous to previous commit. Signed-off-by: Emil Velikov Reviewed-by: Brian Paul --- src/mesa/drivers/dri/i915/intel_context.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 58321698256..139a0337772 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -34,18 +34,9 @@ #include "main/mtypes.h" #include "main/mm.h" -#ifdef __cplusplus -extern "C" { - /* Evil hack for using libdrm in a c++ compiler. */ - #define virtual virt -#endif - #include #include #include -#ifdef __cplusplus - #undef virtual -#endif #include "intel_screen.h" #include "intel_tex_obj.h" @@ -56,6 +47,10 @@ extern "C" { #include "tnl_dd/t_dd_vertex.h" #undef TAG +#ifdef __cplusplus +extern "C" { +#endif + #define DV_PF_555 (1<<8) #define DV_PF_565 (2<<8) #define DV_PF_8888 (3<<8) -- 2.30.2