From 71a6dea0f56d4c90b5e07de85cbaac26055c9a63 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 14 Aug 2010 01:46:21 -0700 Subject: [PATCH] glsl: Clean up header file inclusion. --- src/glsl/apps/compile.c | 1 + src/glsl/apps/process.c | 2 ++ src/glsl/apps/purify.c | 1 + src/glsl/apps/tokenise.c | 2 ++ src/glsl/apps/version.c | 1 + src/glsl/cl/sl_cl_parse.c | 1 + src/glsl/pp/sl_pp_context.c | 1 + src/glsl/pp/sl_pp_context.h | 1 - src/glsl/pp/sl_pp_define.c | 2 ++ src/glsl/pp/sl_pp_error.c | 1 + src/glsl/pp/sl_pp_expression.c | 2 ++ src/glsl/pp/sl_pp_expression.h | 4 ++-- src/glsl/pp/sl_pp_extension.c | 2 ++ src/glsl/pp/sl_pp_if.c | 3 +++ src/glsl/pp/sl_pp_line.c | 2 ++ src/glsl/pp/sl_pp_macro.c | 1 + src/glsl/pp/sl_pp_macro.h | 3 --- src/glsl/pp/sl_pp_pragma.c | 1 + src/glsl/pp/sl_pp_process.c | 3 +++ src/glsl/pp/sl_pp_process.h | 5 +---- src/glsl/pp/sl_pp_public.h | 8 ++------ src/glsl/pp/sl_pp_token_util.c | 1 + src/glsl/pp/sl_pp_token_util.h | 5 ----- src/glsl/pp/sl_pp_version.c | 1 + 24 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/glsl/apps/compile.c b/src/glsl/apps/compile.c index 3aa4fd4..5114fc9 100644 --- a/src/glsl/apps/compile.c +++ b/src/glsl/apps/compile.c @@ -30,6 +30,7 @@ #include #include #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" #include "../cl/sl_cl_parse.h" diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c index caf72a7..6d5ce6e 100644 --- a/src/glsl/apps/process.c +++ b/src/glsl/apps/process.c @@ -30,6 +30,8 @@ #include #include #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" +#include "../pp/sl_pp_token.h" int diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c index 0f09b15..e3fca59 100644 --- a/src/glsl/apps/purify.c +++ b/src/glsl/apps/purify.c @@ -30,6 +30,7 @@ #include #include #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" int diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c index f89f47d..3d68334 100644 --- a/src/glsl/apps/tokenise.c +++ b/src/glsl/apps/tokenise.c @@ -30,6 +30,8 @@ #include #include #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" +#include "../pp/sl_pp_token.h" int diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c index fa5c226..8506f35 100644 --- a/src/glsl/apps/version.c +++ b/src/glsl/apps/version.c @@ -30,6 +30,7 @@ #include #include #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_purify.h" int diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c index 09456f5..c1bc603 100644 --- a/src/glsl/cl/sl_cl_parse.c +++ b/src/glsl/cl/sl_cl_parse.c @@ -29,6 +29,7 @@ #include #include #include "../pp/sl_pp_public.h" +#include "../pp/sl_pp_token.h" #include "sl_cl_parse.h" diff --git a/src/glsl/pp/sl_pp_context.c b/src/glsl/pp/sl_pp_context.c index 74a9bdd..b8e1e99 100644 --- a/src/glsl/pp/sl_pp_context.c +++ b/src/glsl/pp/sl_pp_context.c @@ -27,6 +27,7 @@ #include #include +#include "sl_pp_macro.h" #include "sl_pp_public.h" #include "sl_pp_context.h" diff --git a/src/glsl/pp/sl_pp_context.h b/src/glsl/pp/sl_pp_context.h index 8abb970..e6244f6 100644 --- a/src/glsl/pp/sl_pp_context.h +++ b/src/glsl/pp/sl_pp_context.h @@ -29,7 +29,6 @@ #define SL_PP_CONTEXT_H #include "sl_pp_dict.h" -#include "sl_pp_macro.h" #include "sl_pp_process.h" #include "sl_pp_purify.h" #include "sl_pp_token_util.h" diff --git a/src/glsl/pp/sl_pp_define.c b/src/glsl/pp/sl_pp_define.c index 808a6a0..370e6aa 100644 --- a/src/glsl/pp/sl_pp_define.c +++ b/src/glsl/pp/sl_pp_define.c @@ -28,8 +28,10 @@ #include #include #include "sl_pp_context.h" +#include "sl_pp_macro.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" static void diff --git a/src/glsl/pp/sl_pp_error.c b/src/glsl/pp/sl_pp_error.c index b628e37..482b67f 100644 --- a/src/glsl/pp/sl_pp_error.c +++ b/src/glsl/pp/sl_pp_error.c @@ -30,6 +30,7 @@ #include "sl_pp_context.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" void diff --git a/src/glsl/pp/sl_pp_expression.c b/src/glsl/pp/sl_pp_expression.c index ec90478..c3f48356 100644 --- a/src/glsl/pp/sl_pp_expression.c +++ b/src/glsl/pp/sl_pp_expression.c @@ -27,8 +27,10 @@ #include #include +#include "sl_pp_context.h" #include "sl_pp_expression.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" struct parse_context { diff --git a/src/glsl/pp/sl_pp_expression.h b/src/glsl/pp/sl_pp_expression.h index 377d5b4..522263b 100644 --- a/src/glsl/pp/sl_pp_expression.h +++ b/src/glsl/pp/sl_pp_expression.h @@ -28,8 +28,8 @@ #ifndef SL_PP_EXPRESSION_H #define SL_PP_EXPRESSION_H -#include "sl_pp_context.h" -#include "sl_pp_token.h" +struct sl_pp_context; +struct sl_pp_token_info; int diff --git a/src/glsl/pp/sl_pp_extension.c b/src/glsl/pp/sl_pp_extension.c index d119677..00dbdcf 100644 --- a/src/glsl/pp/sl_pp_extension.c +++ b/src/glsl/pp/sl_pp_extension.c @@ -25,11 +25,13 @@ * **************************************************************************/ +#include #include #include #include "sl_pp_context.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" /** diff --git a/src/glsl/pp/sl_pp_if.c b/src/glsl/pp/sl_pp_if.c index 25cb7a3..6b7a159 100644 --- a/src/glsl/pp/sl_pp_if.c +++ b/src/glsl/pp/sl_pp_if.c @@ -27,8 +27,11 @@ #include #include +#include "sl_pp_context.h" #include "sl_pp_expression.h" +#include "sl_pp_macro.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" static int diff --git a/src/glsl/pp/sl_pp_line.c b/src/glsl/pp/sl_pp_line.c index 6f7e9eb..51581c7 100644 --- a/src/glsl/pp/sl_pp_line.c +++ b/src/glsl/pp/sl_pp_line.c @@ -28,8 +28,10 @@ #include #include #include "sl_pp_context.h" +#include "sl_pp_macro.h" #include "sl_pp_public.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_macro.c b/src/glsl/pp/sl_pp_macro.c index 9f520b8..2cf9ea3 100644 --- a/src/glsl/pp/sl_pp_macro.c +++ b/src/glsl/pp/sl_pp_macro.c @@ -32,6 +32,7 @@ #include "sl_pp_public.h" #include "sl_pp_macro.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" static void diff --git a/src/glsl/pp/sl_pp_macro.h b/src/glsl/pp/sl_pp_macro.h index 1d21068..6e65a0a 100644 --- a/src/glsl/pp/sl_pp_macro.h +++ b/src/glsl/pp/sl_pp_macro.h @@ -28,9 +28,6 @@ #ifndef SL_PP_MACRO_H #define SL_PP_MACRO_H -#include "sl_pp_token.h" - - struct sl_pp_context; struct sl_pp_process_state; struct sl_pp_token_buffer; diff --git a/src/glsl/pp/sl_pp_pragma.c b/src/glsl/pp/sl_pp_pragma.c index caf4c63..6789704 100644 --- a/src/glsl/pp/sl_pp_pragma.c +++ b/src/glsl/pp/sl_pp_pragma.c @@ -29,6 +29,7 @@ #include #include "sl_pp_context.h" #include "sl_pp_process.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_process.c b/src/glsl/pp/sl_pp_process.c index 315ad9b..2f12393 100644 --- a/src/glsl/pp/sl_pp_process.c +++ b/src/glsl/pp/sl_pp_process.c @@ -25,11 +25,14 @@ * **************************************************************************/ +#include #include #include #include "sl_pp_context.h" +#include "sl_pp_macro.h" #include "sl_pp_process.h" #include "sl_pp_public.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_process.h b/src/glsl/pp/sl_pp_process.h index fe6ff0d..04e9be4 100644 --- a/src/glsl/pp/sl_pp_process.h +++ b/src/glsl/pp/sl_pp_process.h @@ -28,11 +28,8 @@ #ifndef SL_PP_PROCESS_H #define SL_PP_PROCESS_H -#include "sl_pp_macro.h" -#include "sl_pp_token.h" - - struct sl_pp_context; +struct sl_pp_token_buffer; struct sl_pp_process_state { struct sl_pp_token_info *out; diff --git a/src/glsl/pp/sl_pp_public.h b/src/glsl/pp/sl_pp_public.h index ca6f722..66ced6c 100644 --- a/src/glsl/pp/sl_pp_public.h +++ b/src/glsl/pp/sl_pp_public.h @@ -28,13 +28,9 @@ #ifndef SL_PP_PUBLIC_H #define SL_PP_PUBLIC_H - struct sl_pp_context; - - -#include "sl_pp_purify.h" -#include "sl_pp_token.h" - +struct sl_pp_purify_options; +struct sl_pp_token_info; struct sl_pp_context * sl_pp_context_create(const char *input, diff --git a/src/glsl/pp/sl_pp_token_util.c b/src/glsl/pp/sl_pp_token_util.c index c85263d..43be496 100644 --- a/src/glsl/pp/sl_pp_token_util.c +++ b/src/glsl/pp/sl_pp_token_util.c @@ -28,6 +28,7 @@ #include #include #include "sl_pp_token_util.h" +#include "sl_pp_token.h" int diff --git a/src/glsl/pp/sl_pp_token_util.h b/src/glsl/pp/sl_pp_token_util.h index 2a668ad..35d7210 100644 --- a/src/glsl/pp/sl_pp_token_util.h +++ b/src/glsl/pp/sl_pp_token_util.h @@ -28,11 +28,6 @@ #ifndef SL_PP_TOKEN_UTIL_H #define SL_PP_TOKEN_UTIL_H -#include -#include -#include "sl_pp_token.h" - - struct sl_pp_context; /* diff --git a/src/glsl/pp/sl_pp_version.c b/src/glsl/pp/sl_pp_version.c index 3c995b7..6735c05 100644 --- a/src/glsl/pp/sl_pp_version.c +++ b/src/glsl/pp/sl_pp_version.c @@ -29,6 +29,7 @@ #include #include "sl_pp_public.h" #include "sl_pp_context.h" +#include "sl_pp_token.h" int -- 2.7.4