Mesa (master): mesa: remove an extern "C" wrapper in shader_query.cpp

Brian Paul brianp at kemper.freedesktop.org
Tue Sep 29 17:57:02 UTC 2015


Module: Mesa
Branch: master
Commit: 3bbff1e26ee8bbf63f7a954c3f24d514486939e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bbff1e26ee8bbf63f7a954c3f24d514486939e5

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Sep 26 20:14:57 2015 -0600

mesa: remove an extern "C" wrapper in shader_query.cpp

The shaderapi.h header already has the extern "C" wrapper.

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/main/shader_query.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
index b6d3677..16b43e8 100644
--- a/src/mesa/main/shader_query.cpp
+++ b/src/mesa/main/shader_query.cpp
@@ -32,6 +32,7 @@
 #include "main/core.h"
 #include "glsl_symbol_table.h"
 #include "ir.h"
+#include "shaderapi.h"
 #include "shaderobj.h"
 #include "program/hash_table.h"
 #include "../glsl/program.h"
@@ -39,9 +40,6 @@
 #include "main/enums.h"
 #include "util/strndup.h"
 
-extern "C" {
-#include "shaderapi.h"
-}
 
 static GLint
 program_resource_location(struct gl_shader_program *shProg,




More information about the mesa-commit mailing list