From cd9102214bdfbe7d497587f6c46fc37b52d58b91 Mon Sep 17 00:00:00 2001 From: axel Date: Fri, 11 Aug 2006 11:18:35 +1000 Subject: [PATCH] Rearrange includes so that config.h is always the first file to be included darcs-hash:20060811011835-ac50b-847fc790288e3bb3f3a0ee7734ff278d2dc65bef.gz --- builtin.c | 4 ++-- builtin_commandline.c | 4 ++-- builtin_complete.c | 4 ++-- builtin_help.hdr | 3 ++- builtin_jobs.c | 3 +-- builtin_set.c | 4 ++-- complete.c | 3 ++- count.c | 2 ++ event.c | 4 ++-- exec.c | 4 ++-- expand.c | 4 ++-- function.c | 5 +++-- highlight.c | 4 ++-- history.c | 4 ++-- kill.c | 4 ++-- parser.c | 4 ++-- sanity.c | 4 ++-- 17 files changed, 34 insertions(+), 30 deletions(-) diff --git a/builtin.c b/builtin.c index b83a272a3..3087b1db7 100644 --- a/builtin.c +++ b/builtin.c @@ -21,6 +21,8 @@ */ +#include "config.h" + #include #include #include @@ -37,8 +39,6 @@ #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/builtin_commandline.c b/builtin_commandline.c index fd7383eb4..c6f779cdf 100644 --- a/builtin_commandline.c +++ b/builtin_commandline.c @@ -3,6 +3,8 @@ Functions used for implementing the commandline builtin. */ +#include "config.h" + #include #include #include @@ -11,8 +13,6 @@ Functions used for implementing the commandline builtin. #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/builtin_complete.c b/builtin_complete.c index a9bf69e46..18f85c4ab 100644 --- a/builtin_complete.c +++ b/builtin_complete.c @@ -3,6 +3,8 @@ Functions used for implementing the complete builtin. */ +#include "config.h" + #include #include #include @@ -11,8 +13,6 @@ Functions used for implementing the complete builtin. #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/builtin_help.hdr b/builtin_help.hdr index 2c68031ec..f209680f6 100644 --- a/builtin_help.hdr +++ b/builtin_help.hdr @@ -5,13 +5,14 @@ various help files in the doc_src directory. */ +#include "config.h" + #include #include #include #include #include -#include "config.h" #include "util.h" #include "common.h" #include "halloc_util.h" diff --git a/builtin_jobs.c b/builtin_jobs.c index 5a339cce9..361f4a196 100644 --- a/builtin_jobs.c +++ b/builtin_jobs.c @@ -1,6 +1,7 @@ /** \file builtin_jobs.c Functions for executing the jobs builtin. */ +#include "config.h" #include #include @@ -13,8 +14,6 @@ #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/builtin_set.c b/builtin_set.c index 882f24e12..9120178dc 100644 --- a/builtin_set.c +++ b/builtin_set.c @@ -3,6 +3,8 @@ Functions used for implementing the set builtin. */ +#include "config.h" + #include #include #include @@ -11,8 +13,6 @@ Functions used for implementing the set builtin. #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/complete.c b/complete.c index 9e66f0cd8..48ec50ceb 100644 --- a/complete.c +++ b/complete.c @@ -3,6 +3,8 @@ These functions are used for storing and retrieving tab-completion data, as well as for performing tab-completion. */ +#include "config.h" + #include #include #include @@ -20,7 +22,6 @@ #include #include -#include "config.h" #include "fallback.h" #include "util.h" diff --git a/count.c b/count.c index f57b80481..66525ef81 100644 --- a/count.c +++ b/count.c @@ -2,6 +2,8 @@ The length command, used for determining the number of items in an environment variable array. */ +#include "config.h" + #include #include diff --git a/event.c b/event.c index d16a3d39d..ef1e464b7 100644 --- a/event.c +++ b/event.c @@ -3,6 +3,8 @@ Functions for handling event triggers */ +#include "config.h" + #include #include #include @@ -11,8 +13,6 @@ #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/exec.c b/exec.c index a36e81eaa..a3d77d62d 100644 --- a/exec.c +++ b/exec.c @@ -5,6 +5,8 @@ manual, though I the changes performed have been massive. */ +#include "config.h" + #include #include #include @@ -25,8 +27,6 @@ #include #endif -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/expand.c b/expand.c index 966eb44c8..21bfe0e23 100644 --- a/expand.c +++ b/expand.c @@ -5,6 +5,8 @@ parameter expansion. */ +#include "config.h" + #include #include #include @@ -26,8 +28,6 @@ parameter expansion. #include #endif -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/function.c b/function.c index cc39d9eaf..d4b2c9cc9 100644 --- a/function.c +++ b/function.c @@ -1,6 +1,9 @@ /** \file function.c Functions for storing and retrieving function information. */ + +#include "config.h" + #include #include #include @@ -8,8 +11,6 @@ #include #include -#include "config.h" - #include "wutil.h" #include "fallback.h" #include "util.h" diff --git a/highlight.c b/highlight.c index d1c50195c..fa8393a45 100644 --- a/highlight.c +++ b/highlight.c @@ -1,6 +1,8 @@ /** \file highlight.c Functions for syntax highlighting */ +#include "config.h" + #include #include #include @@ -11,8 +13,6 @@ #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/history.c b/history.c index d3c0ceb64..e0d02b0bf 100644 --- a/history.c +++ b/history.c @@ -1,6 +1,8 @@ /** \file history.c History functions, part of the user interface. */ +#include "config.h" + #include #include #include @@ -11,8 +13,6 @@ #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/kill.c b/kill.c index 12a4ae956..c49084a02 100644 --- a/kill.c +++ b/kill.c @@ -6,6 +6,8 @@ with the X clipboard. */ +#include "config.h" + #include #include #include @@ -17,8 +19,6 @@ #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/parser.c b/parser.c index 1db9c3918..e7c936454 100644 --- a/parser.c +++ b/parser.c @@ -4,6 +4,8 @@ The fish parser. Contains functions for parsing code. */ +#include "config.h" + #include #include #include @@ -17,8 +19,6 @@ The fish parser. Contains functions for parsing code. #include #include -#include "config.h" - #include "fallback.h" #include "util.h" diff --git a/sanity.c b/sanity.c index f7e203239..3e51b4f3a 100644 --- a/sanity.c +++ b/sanity.c @@ -1,6 +1,8 @@ /** \file sanity.c Functions for performing sanity checks on the program state */ +#include "config.h" + #include #include #include @@ -13,8 +15,6 @@ #include -#include "config.h" - #include "fallback.h" #include "util.h"