From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 16 Feb 2017 15:16:41 +0000 (+0000)
Subject: i965: remove 'virtual' and extern C workarounds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3ea07d2be9350bcf31c7ef3ec46bfcd5d7765350;p=mesa.git

i965: remove 'virtual' and extern C workarounds

The headers are properly annotated thus we don't need these.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

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 <intel_bufmgr.h>
-#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