aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-05-27 13:27:18 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-05-27 13:27:18 +0000
commit1510216a55562da7c1919559bd1aa885286ffc1f (patch)
tree77ed25e9d33dfd79eb0b6fdfe0766d653984dc71
parent55fb9da5b83dfda9b191c9d18c3a80616d8a80c0 (diff)
downloadbusybox-1510216a55562da7c1919559bd1aa885286ffc1f.tar.gz
- Spaghetti alert. Fix clash with ancient fwd-decl. This is an unfortunate
combination of linux not providing a useable linux/module.h to userspace and mixing legacy-cruft with the current stuff in one insmod.c.
-rw-r--r--modutils/insmod.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 9242e08e4..3a8201feb 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -4183,7 +4183,8 @@ int insmod_main(int argc, char **argv)
#include <sys/mman.h>
-#ifdef __UCLIBC__
+#if defined __UCLIBC__ && !ENABLE_FEATURE_2_4_MODULES
+/* big time suckage. The old prototype above renders our nice fwd-decl wrong */
extern int init_module(void *module, unsigned long len, const char *options);
#else
#include <asm/unistd.h>