From 3ea07d2be9350bcf31c7ef3ec46bfcd5d7765350 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 16 Feb 2017 15:16:41 +0000 Subject: [PATCH] i965: remove 'virtual' and extern C workarounds The headers are properly annotated thus we don't need these. Signed-off-by: Emil Velikov Reviewed-by: Brian Paul --- src/mesa/drivers/dri/i965/brw_context.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 01e651b09f0..ce4816fc984 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -43,26 +43,16 @@ #include "isl/isl.h" #include "blorp/blorp.h" -#ifdef __cplusplus -extern "C" { - /* Evil hack for using libdrm in a c++ compiler. */ - #define virtual virt -#endif - #include -#ifdef __cplusplus - #undef virtual -} -#endif -#ifdef __cplusplus -extern "C" { -#endif #include "intel_debug.h" #include "intel_screen.h" #include "intel_tex_obj.h" #include "intel_resolve_map.h" +#ifdef __cplusplus +extern "C" { +#endif /* Glossary: * * URB - uniform resource buffer. A mid-sized buffer which is -- 2.30.2