[Mesa-dev] [PATCH 10/10] glsl: remove unneeded extern "C" {} bracketing around Mesa includes

Brian Paul brianp at vmware.com
Wed Jan 17 05:17:14 UTC 2018


The two headers already have the right extern "C" annotations.
---
 src/compiler/glsl/serialize.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/compiler/glsl/serialize.cpp b/src/compiler/glsl/serialize.cpp
index 769ab56..63ce41d 100644
--- a/src/compiler/glsl/serialize.cpp
+++ b/src/compiler/glsl/serialize.cpp
@@ -33,13 +33,11 @@
 #include "compiler/shader_info.h"
 #include "ir_uniform.h"
 #include "main/mtypes.h"
+#include "main/shaderobj.h"
+#include "program/program.h"
 #include "string_to_uint_map.h"
 #include "util/bitscan.h"
 
-extern "C" {
-#include "main/shaderobj.h"
-#include "program/program.h"
-}
 
 static void
 write_subroutines(struct blob *metadata, struct gl_shader_program *prog)
-- 
2.7.4



More information about the mesa-dev mailing list