svn commit: trunk/busybox/modutils

[aldot at busybox.net]

Author: aldot
Date: 2008-05-27 06:27:18 -0700 (Tue, 27 May 2008)
New Revision: 22093

Log:
- 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.


Modified:
   trunk/busybox/modutils/insmod.c


Changeset:
Modified: trunk/busybox/modutils/insmod.c
===================================================================
--- trunk/busybox/modutils/insmod.c	2008-05-27 12:42:39 UTC (rev 22092)
+++ trunk/busybox/modutils/insmod.c	2008-05-27 13:27:18 UTC (rev 22093)
@@ -4183,7 +4183,8 @@
 
 #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>