From: Emil Velikov <emil.veli...@collabora.com> 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 <emil.veli...@collabora.com> --- 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 c1b6758ba0..14227023ba 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 ed7a3adfe1..3df54ce5b8 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; -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev