diff options
| -rw-r--r-- | coreutils/md5sum.c | 20 | ||||
| -rw-r--r-- | editors/vi.c | 8 | ||||
| -rw-r--r-- | hostname.c | 4 | ||||
| -rw-r--r-- | md5sum.c | 20 | ||||
| -rw-r--r-- | networking/hostname.c | 4 | ||||
| -rw-r--r-- | vi.c | 8 |
6 files changed, 26 insertions, 38 deletions
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c index e5a2abe78..dcb05c156 100644 --- a/coreutils/md5sum.c +++ b/coreutils/md5sum.c @@ -24,6 +24,13 @@ #include <errno.h> #include <ctype.h> #include <getopt.h> +#include <stdlib.h> +#include <string.h> +#include <endian.h> +#include <sys/types.h> +#if defined HAVE_LIMITS_H +# include <limits.h> +#endif #include "busybox.h" /* For some silly reason, this file uses backwards TRUE and FALSE conventions */ @@ -60,12 +67,6 @@ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ -#include <sys/types.h> -#include <stdlib.h> -#include <string.h> -#include <endian.h> - -#include "busybox.h" //---------------------------------------------------------------------------- //--------md5.h //---------------------------------------------------------------------------- @@ -93,12 +94,6 @@ #ifndef _MD5_H static const int _MD5_H = 1; -#include <stdio.h> - -#if defined HAVE_LIMITS_H || defined _LIBC -# include <limits.h> -#endif - /* The following contortions are an attempt to use the C preprocessor to determine an unsigned integral type that is 32 bits wide. An alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but @@ -106,7 +101,6 @@ static const int _MD5_H = 1; the resulting executable. Locally running cross-compiled executables is usually not possible. */ -# include <sys/types.h> typedef u_int32_t md5_uint32; /* Structure to save state of computation between the single steps. */ diff --git a/editors/vi.c b/editors/vi.c index 6d1502966..bd183e8b0 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -19,7 +19,7 @@ */ char *vi_Version = - "$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $"; + "$Id: vi.c,v 1.9 2001/06/23 13:49:14 andersen Exp $"; /* * To compile for standalone use: @@ -65,9 +65,6 @@ char *vi_Version = //#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute #endif /* STANDALONE */ -#ifndef STANDALONE -#include "busybox.h" -#endif /* STANDALONE */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -86,6 +83,9 @@ char *vi_Version = #include <assert.h> #include <errno.h> #include <stdarg.h> +#ifndef STANDALONE +#include "busybox.h" +#endif /* STANDALONE */ #ifndef TRUE #define TRUE ((int)1) diff --git a/hostname.c b/hostname.c index 75e4d2e57..573c8cece 100644 --- a/hostname.c +++ b/hostname.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $ + * $Id: hostname.c,v 1.29 2001/06/23 13:49:14 andersen Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -23,7 +23,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "busybox.h" #include <errno.h> #include <arpa/inet.h> #include <netdb.h> @@ -31,6 +30,7 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> +#include "busybox.h" static void do_sethostname(char *s, int isfile) { @@ -24,6 +24,13 @@ #include <errno.h> #include <ctype.h> #include <getopt.h> +#include <stdlib.h> +#include <string.h> +#include <endian.h> +#include <sys/types.h> +#if defined HAVE_LIMITS_H +# include <limits.h> +#endif #include "busybox.h" /* For some silly reason, this file uses backwards TRUE and FALSE conventions */ @@ -60,12 +67,6 @@ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ -#include <sys/types.h> -#include <stdlib.h> -#include <string.h> -#include <endian.h> - -#include "busybox.h" //---------------------------------------------------------------------------- //--------md5.h //---------------------------------------------------------------------------- @@ -93,12 +94,6 @@ #ifndef _MD5_H static const int _MD5_H = 1; -#include <stdio.h> - -#if defined HAVE_LIMITS_H || defined _LIBC -# include <limits.h> -#endif - /* The following contortions are an attempt to use the C preprocessor to determine an unsigned integral type that is 32 bits wide. An alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but @@ -106,7 +101,6 @@ static const int _MD5_H = 1; the resulting executable. Locally running cross-compiled executables is usually not possible. */ -# include <sys/types.h> typedef u_int32_t md5_uint32; /* Structure to save state of computation between the single steps. */ diff --git a/networking/hostname.c b/networking/hostname.c index 75e4d2e57..573c8cece 100644 --- a/networking/hostname.c +++ b/networking/hostname.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $ + * $Id: hostname.c,v 1.29 2001/06/23 13:49:14 andersen Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -23,7 +23,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "busybox.h" #include <errno.h> #include <arpa/inet.h> #include <netdb.h> @@ -31,6 +30,7 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> +#include "busybox.h" static void do_sethostname(char *s, int isfile) { @@ -19,7 +19,7 @@ */ char *vi_Version = - "$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $"; + "$Id: vi.c,v 1.9 2001/06/23 13:49:14 andersen Exp $"; /* * To compile for standalone use: @@ -65,9 +65,6 @@ char *vi_Version = //#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute #endif /* STANDALONE */ -#ifndef STANDALONE -#include "busybox.h" -#endif /* STANDALONE */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -86,6 +83,9 @@ char *vi_Version = #include <assert.h> #include <errno.h> #include <stdarg.h> +#ifndef STANDALONE +#include "busybox.h" +#endif /* STANDALONE */ #ifndef TRUE #define TRUE ((int)1) |