From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Tue, 27 May 2008 13:27:18 +0000 (-0000)
Subject: - Spaghetti alert. Fix clash with ancient fwd-decl. This is an unfortunate
X-Git-Tag: 1_11_0~163
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1510216a55562da7c1919559bd1aa885286ffc1f;p=oweals%2Fbusybox.git

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

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>