diff options
| author | Denys Vlasenko | 2016-12-22 15:21:58 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2016-12-22 15:21:58 +0100 |
| commit | 6704746c697ace0cc0de5b231fc8be4db06c40f4 (patch) | |
| tree | e1c684030876310ff9ff7e68d4615f59ec680625 /shell/hush.c | |
| parent | 4acd393eba179f7dfe70f647e3798bc8d10c783a (diff) | |
| download | busybox-6704746c697ace0cc0de5b231fc8be4db06c40f4.zip busybox-6704746c697ace0cc0de5b231fc8be4db06c40f4.tar.gz | |
shell: move "config" blocks above their use in coditional includes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
| -rw-r--r-- | shell/hush.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/shell/hush.c b/shell/hush.c index 888be6e..c582125 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -82,35 +82,6 @@ * $ "export" i=`echo 'aaa bbb'`; echo "$i" * aaa */ -#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ - || defined(__APPLE__) \ - ) -# include <malloc.h> /* for malloc_trim */ -#endif -#include <glob.h> -/* #include <dmalloc.h> */ -#if ENABLE_HUSH_CASE -# include <fnmatch.h> -#endif -#include <sys/utsname.h> /* for setting $HOSTNAME */ - -#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ -#include "unicode.h" -#include "shell_common.h" -#include "math.h" -#include "match.h" -#if ENABLE_HUSH_RANDOM_SUPPORT -# include "random.h" -#else -# define CLEAR_RANDOM_T(rnd) ((void)0) -#endif -#ifndef F_DUPFD_CLOEXEC -# define F_DUPFD_CLOEXEC F_DUPFD -#endif -#ifndef PIPE_BUF -# define PIPE_BUF 4096 /* amount of buffering in a pipe */ -#endif - //config:config HUSH //config: bool "hush" //config: default y @@ -277,6 +248,35 @@ //usage:# define bash_full_usage hush_full_usage //usage:#endif +#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ + || defined(__APPLE__) \ + ) +# include <malloc.h> /* for malloc_trim */ +#endif +#include <glob.h> +/* #include <dmalloc.h> */ +#if ENABLE_HUSH_CASE +# include <fnmatch.h> +#endif +#include <sys/utsname.h> /* for setting $HOSTNAME */ + +#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ +#include "unicode.h" +#include "shell_common.h" +#include "math.h" +#include "match.h" +#if ENABLE_HUSH_RANDOM_SUPPORT +# include "random.h" +#else +# define CLEAR_RANDOM_T(rnd) ((void)0) +#endif +#ifndef F_DUPFD_CLOEXEC +# define F_DUPFD_CLOEXEC F_DUPFD +#endif +#ifndef PIPE_BUF +# define PIPE_BUF 4096 /* amount of buffering in a pipe */ +#endif + /* Build knobs */ #define LEAK_HUNTING 0 |