summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-02-16 15:16:41 +0000
committerEmil Velikov <[email protected]>2017-02-21 18:29:38 +0000
commit3ea07d2be9350bcf31c7ef3ec46bfcd5d7765350 (patch)
tree615353f1c3486bb9e6190628e8ab1d7759ea3504
parent84819146814d3ca1cbfb21ec746063da8613b0b7 (diff)
i965: remove 'virtual' and extern C workarounds
The headers are properly annotated thus we don't need these. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h16
1 files 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 <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