From e0c0757d0925d7f83e2e107861c4e3ec8f525108 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 23 Jun 2001 13:49:14 +0000 Subject: [PATCH] These were broken when using dmalloc due to include file ordering problems. busybox.h must be last. -Erik --- coreutils/md5sum.c | 20 +++++++------------- editors/vi.c | 8 ++++---- hostname.c | 4 ++-- md5sum.c | 20 +++++++------------- networking/hostname.c | 4 ++-- 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 #include #include +#include +#include +#include +#include +#if defined HAVE_LIMITS_H +# include +#endif #include "busybox.h" /* For some silly reason, this file uses backwards TRUE and FALSE conventions */ @@ -60,12 +67,6 @@ /* Written by Ulrich Drepper , 1995. */ -#include -#include -#include -#include - -#include "busybox.h" //---------------------------------------------------------------------------- //--------md5.h //---------------------------------------------------------------------------- @@ -93,12 +94,6 @@ #ifndef _MD5_H static const int _MD5_H = 1; -#include - -#if defined HAVE_LIMITS_H || defined _LIBC -# include -#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 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 #include #include @@ -86,6 +83,9 @@ char *vi_Version = #include #include #include +#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 @@ -23,7 +23,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "busybox.h" #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include "busybox.h" static void do_sethostname(char *s, int isfile) { diff --git a/md5sum.c b/md5sum.c index e5a2abe78..dcb05c156 100644 --- a/md5sum.c +++ b/md5sum.c @@ -24,6 +24,13 @@ #include #include #include +#include +#include +#include +#include +#if defined HAVE_LIMITS_H +# include +#endif #include "busybox.h" /* For some silly reason, this file uses backwards TRUE and FALSE conventions */ @@ -60,12 +67,6 @@ /* Written by Ulrich Drepper , 1995. */ -#include -#include -#include -#include - -#include "busybox.h" //---------------------------------------------------------------------------- //--------md5.h //---------------------------------------------------------------------------- @@ -93,12 +94,6 @@ #ifndef _MD5_H static const int _MD5_H = 1; -#include - -#if defined HAVE_LIMITS_H || defined _LIBC -# include -#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 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 @@ -23,7 +23,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "busybox.h" #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include "busybox.h" static void do_sethostname(char *s, int isfile) { diff --git a/vi.c b/vi.c index 6d1502966..bd183e8b0 100644 --- a/vi.c +++ b/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 #include #include @@ -86,6 +83,9 @@ char *vi_Version = #include #include #include +#ifndef STANDALONE +#include "busybox.h" +#endif /* STANDALONE */ #ifndef TRUE #define TRUE ((int)1)