diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-06-23 13:49:14 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-06-23 13:49:14 +0000 |
commit | e0c0757d0925d7f83e2e107861c4e3ec8f525108 (patch) | |
tree | 806346c72b573fa64f1c381ea49853fcf15a2964 /coreutils/md5sum.c | |
parent | d9c8acec373213fb4c1778ab03364372fdf7a63b (diff) | |
download | busybox-w32-e0c0757d0925d7f83e2e107861c4e3ec8f525108.tar.gz busybox-w32-e0c0757d0925d7f83e2e107861c4e3ec8f525108.tar.bz2 busybox-w32-e0c0757d0925d7f83e2e107861c4e3ec8f525108.zip |
These were broken when using dmalloc due to include file ordering
problems. busybox.h must be last.
-Erik
Diffstat (limited to 'coreutils/md5sum.c')
-rw-r--r-- | coreutils/md5sum.c | 20 |
1 files changed, 7 insertions, 13 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 @@ | |||
24 | #include <errno.h> | 24 | #include <errno.h> |
25 | #include <ctype.h> | 25 | #include <ctype.h> |
26 | #include <getopt.h> | 26 | #include <getopt.h> |
27 | #include <stdlib.h> | ||
28 | #include <string.h> | ||
29 | #include <endian.h> | ||
30 | #include <sys/types.h> | ||
31 | #if defined HAVE_LIMITS_H | ||
32 | # include <limits.h> | ||
33 | #endif | ||
27 | #include "busybox.h" | 34 | #include "busybox.h" |
28 | 35 | ||
29 | /* For some silly reason, this file uses backwards TRUE and FALSE conventions */ | 36 | /* For some silly reason, this file uses backwards TRUE and FALSE conventions */ |
@@ -60,12 +67,6 @@ | |||
60 | 67 | ||
61 | /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ | 68 | /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ |
62 | 69 | ||
63 | #include <sys/types.h> | ||
64 | #include <stdlib.h> | ||
65 | #include <string.h> | ||
66 | #include <endian.h> | ||
67 | |||
68 | #include "busybox.h" | ||
69 | //---------------------------------------------------------------------------- | 70 | //---------------------------------------------------------------------------- |
70 | //--------md5.h | 71 | //--------md5.h |
71 | //---------------------------------------------------------------------------- | 72 | //---------------------------------------------------------------------------- |
@@ -93,12 +94,6 @@ | |||
93 | #ifndef _MD5_H | 94 | #ifndef _MD5_H |
94 | static const int _MD5_H = 1; | 95 | static const int _MD5_H = 1; |
95 | 96 | ||
96 | #include <stdio.h> | ||
97 | |||
98 | #if defined HAVE_LIMITS_H || defined _LIBC | ||
99 | # include <limits.h> | ||
100 | #endif | ||
101 | |||
102 | /* The following contortions are an attempt to use the C preprocessor | 97 | /* The following contortions are an attempt to use the C preprocessor |
103 | to determine an unsigned integral type that is 32 bits wide. An | 98 | to determine an unsigned integral type that is 32 bits wide. An |
104 | alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but | 99 | alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but |
@@ -106,7 +101,6 @@ static const int _MD5_H = 1; | |||
106 | the resulting executable. Locally running cross-compiled executables | 101 | the resulting executable. Locally running cross-compiled executables |
107 | is usually not possible. */ | 102 | is usually not possible. */ |
108 | 103 | ||
109 | # include <sys/types.h> | ||
110 | typedef u_int32_t md5_uint32; | 104 | typedef u_int32_t md5_uint32; |
111 | 105 | ||
112 | /* Structure to save state of computation between the single steps. */ | 106 | /* Structure to save state of computation between the single steps. */ |