From a177a13033cf9356eb26e8757055037a54268a18 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 16 Feb 2017 15:16:36 +0000 Subject: [PATCH] st/mesa: move extern C wrappers where applicable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Nicolai Hähnle Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_atifs_to_tgsi.h | 6 +++--- src/mesa/state_tracker/st_mesa_to_tgsi.h | 8 ++++---- 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;