summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-02-16 15:16:36 +0000
committerEmil Velikov <[email protected]>2017-02-21 18:29:07 +0000
commita177a13033cf9356eb26e8757055037a54268a18 (patch)
tree3472376e1c7febdbe160b5c940e486a5ce65b1ef
parent94b88c1c757e5d3a93a79d6227daaf834de063d9 (diff)
st/mesa: move extern C wrappers where applicable
Namely, after the include directives. The headers are properly annotated so keeping things as-is is only asking for trouble. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_atifs_to_tgsi.h6
-rw-r--r--src/mesa/state_tracker/st_mesa_to_tgsi.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_atifs_to_tgsi.h b/src/mesa/state_tracker/st_atifs_to_tgsi.h
index c1b6758ba02..14227023ba0 100644
--- a/src/mesa/state_tracker/st_atifs_to_tgsi.h
+++ b/src/mesa/state_tracker/st_atifs_to_tgsi.h
@@ -23,13 +23,13 @@
#ifndef ST_ATIFS_TO_TGSI_H
#define ST_ATIFS_TO_TGSI_H
+#include "main/glheader.h"
+#include "pipe/p_defines.h"
+
#if defined __cplusplus
extern "C" {
#endif
-#include "main/glheader.h"
-#include "pipe/p_defines.h"
-
struct gl_context;
struct gl_program;
struct ureg_program;
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h
index ed7a3adfe1a..3df54ce5b87 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.h
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -29,15 +29,15 @@
#ifndef ST_MESA_TO_TGSI_H
#define ST_MESA_TO_TGSI_H
-#if defined __cplusplus
-extern "C" {
-#endif
-
#include "main/glheader.h"
#include "pipe/p_compiler.h"
#include "pipe/p_defines.h"
+#if defined __cplusplus
+extern "C" {
+#endif
+
struct gl_context;
struct gl_program;
struct tgsi_token;