[Mesa-dev] [PATCH 07/11] i965: do not wrap header inclusion in extern "C"

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/mesa/drivers/dri/i965/brw_vec4.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index 3f67432..574d134 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -25,28 +25,21 @@
 #define BRW_VEC4_H
 
 #include <stdint.h>
-#include "brw_shader.h"
+#include "glsl/ir.h"
+#include "glsl/nir/nir.h"
 #include "main/compiler.h"
 #include "program/hash_table.h"
-#include "brw_program.h"
-
-#ifdef __cplusplus
-#include "brw_ir_vec4.h"
-
-extern "C" {
-#endif
 
 #include "brw_context.h"
 #include "brw_eu.h"
+#include "brw_program.h"
+#include "brw_shader.h"
 #include "intel_asm_annotation.h"
 
 #ifdef __cplusplus
-}; /* extern "C" */
+#include "brw_ir_vec4.h"
 #endif
 
-#include "glsl/ir.h"
-#include "glsl/nir/nir.h"
-
 
 #ifdef __cplusplus
 extern "C" {
-- 
2.6.2