diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-02-20 06:14:08 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-02-20 06:14:08 +0000 |
| commit | b59ae6c5acd924f88fc9cb4285ed283f27c65194 (patch) | |
| tree | 49d1bb722d95eb1aded6b5d354ac86e56c481c10 /modutils | |
| parent | 59d90b8337e20463074c14f5215e7f2fdeb800ad (diff) | |
| download | busybox-w32-b59ae6c5acd924f88fc9cb4285ed283f27c65194.tar.gz busybox-w32-b59ae6c5acd924f88fc9cb4285ed283f27c65194.tar.bz2 busybox-w32-b59ae6c5acd924f88fc9cb4285ed283f27c65194.zip | |
It turns out that DODMALLOC was broken when I reorganized busybox.h
header file usage before the 0.49 release. To fix it, I had to move
the '#include "busybox.h"' to the end of the list of #include files.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@1864 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 6 | ||||
| -rw-r--r-- | modutils/lsmod.c | 2 | ||||
| -rw-r--r-- | modutils/rmmod.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 58273521f..166f0fc4b 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * | 37 | * |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include "busybox.h" | ||
| 41 | #include <stdlib.h> | 40 | #include <stdlib.h> |
| 42 | #include <stdio.h> | 41 | #include <stdio.h> |
| 43 | #include <stddef.h> | 42 | #include <stddef.h> |
| @@ -51,6 +50,7 @@ | |||
| 51 | #include <sys/utsname.h> | 50 | #include <sys/utsname.h> |
| 52 | #include <sys/syscall.h> | 51 | #include <sys/syscall.h> |
| 53 | #include <linux/unistd.h> | 52 | #include <linux/unistd.h> |
| 53 | #include "busybox.h" | ||
| 54 | 54 | ||
| 55 | //---------------------------------------------------------------------------- | 55 | //---------------------------------------------------------------------------- |
| 56 | //--------modutils module.h, lines 45-242 | 56 | //--------modutils module.h, lines 45-242 |
| @@ -81,7 +81,7 @@ | |||
| 81 | #ifndef MODUTILS_MODULE_H | 81 | #ifndef MODUTILS_MODULE_H |
| 82 | static const int MODUTILS_MODULE_H = 1; | 82 | static const int MODUTILS_MODULE_H = 1; |
| 83 | 83 | ||
| 84 | #ident "$Id: insmod.c,v 1.47 2001/02/15 19:07:43 andersen Exp $" | 84 | #ident "$Id: insmod.c,v 1.48 2001/02/20 06:14:07 andersen Exp $" |
| 85 | 85 | ||
| 86 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 86 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
| 87 | We do not use the kernel headers directly because we do not wish | 87 | We do not use the kernel headers directly because we do not wish |
| @@ -287,7 +287,7 @@ int delete_module(const char *); | |||
| 287 | #ifndef MODUTILS_OBJ_H | 287 | #ifndef MODUTILS_OBJ_H |
| 288 | static const int MODUTILS_OBJ_H = 1; | 288 | static const int MODUTILS_OBJ_H = 1; |
| 289 | 289 | ||
| 290 | #ident "$Id: insmod.c,v 1.47 2001/02/15 19:07:43 andersen Exp $" | 290 | #ident "$Id: insmod.c,v 1.48 2001/02/20 06:14:07 andersen Exp $" |
| 291 | 291 | ||
| 292 | /* The relocatable object is manipulated using elfin types. */ | 292 | /* The relocatable object is manipulated using elfin types. */ |
| 293 | 293 | ||
diff --git a/modutils/lsmod.c b/modutils/lsmod.c index f39cbc08f..c97d199a6 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "busybox.h" | ||
| 29 | #include <stdlib.h> | 28 | #include <stdlib.h> |
| 30 | #include <stdio.h> | 29 | #include <stdio.h> |
| 31 | #include <stddef.h> | 30 | #include <stddef.h> |
| @@ -37,6 +36,7 @@ | |||
| 37 | #include <getopt.h> | 36 | #include <getopt.h> |
| 38 | #include <sys/utsname.h> | 37 | #include <sys/utsname.h> |
| 39 | #include <sys/file.h> | 38 | #include <sys/file.h> |
| 39 | #include "busybox.h" | ||
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | 42 | ||
diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 7d4538e6e..aab326123 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c | |||
| @@ -21,13 +21,13 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "busybox.h" | ||
| 25 | #include <stdio.h> | 24 | #include <stdio.h> |
| 26 | #include <errno.h> | 25 | #include <errno.h> |
| 27 | #include <unistd.h> | 26 | #include <unistd.h> |
| 28 | #include <stdlib.h> | 27 | #include <stdlib.h> |
| 29 | #include <sys/syscall.h> | 28 | #include <sys/syscall.h> |
| 30 | #include <linux/unistd.h> | 29 | #include <linux/unistd.h> |
| 30 | #include "busybox.h" | ||
| 31 | #define __LIBRARY__ | 31 | #define __LIBRARY__ |
| 32 | 32 | ||
| 33 | 33 | ||
