From 3b8b434e536f06402f04080826fd971a7384c144 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 22 Aug 2001 05:43:14 +0000 Subject: [PATCH] Force BB_FEATURE_NEW_MODULE_INTERFACE and BB_FEATURE_OLD_MODULE_INTERFACE to be mutually exclusive (stable branch) --- busybox/insmod.c | 5 +---- busybox/modutils/insmod.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/busybox/insmod.c b/busybox/insmod.c index 6765f82d6..413af5ce7 100644 --- a/busybox/insmod.c +++ b/busybox/insmod.c @@ -67,6 +67,7 @@ #include "busybox.h" #ifdef BB_FEATURE_NEW_MODULE_INTERFACE +# undef BB_FEATURE_OLD_MODULE_INTERFACE # define new_sys_init_module init_module #else # define old_sys_init_module init_module @@ -133,8 +134,6 @@ #ifndef MODUTILS_MODULE_H static const int MODUTILS_MODULE_H = 1; -#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $" - /* This file contains the structures used by the 2.0 and 2.1 kernels. We do not use the kernel headers directly because we do not wish to be dependant on a particular kernel version to compile insmod. */ @@ -350,8 +349,6 @@ int delete_module(const char *); #ifndef MODUTILS_OBJ_H static const int MODUTILS_OBJ_H = 1; -#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $" - /* The relocatable object is manipulated using elfin types. */ #include diff --git a/busybox/modutils/insmod.c b/busybox/modutils/insmod.c index 6765f82d6..413af5ce7 100644 --- a/busybox/modutils/insmod.c +++ b/busybox/modutils/insmod.c @@ -67,6 +67,7 @@ #include "busybox.h" #ifdef BB_FEATURE_NEW_MODULE_INTERFACE +# undef BB_FEATURE_OLD_MODULE_INTERFACE # define new_sys_init_module init_module #else # define old_sys_init_module init_module @@ -133,8 +134,6 @@ #ifndef MODUTILS_MODULE_H static const int MODUTILS_MODULE_H = 1; -#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $" - /* This file contains the structures used by the 2.0 and 2.1 kernels. We do not use the kernel headers directly because we do not wish to be dependant on a particular kernel version to compile insmod. */ @@ -350,8 +349,6 @@ int delete_module(const char *); #ifndef MODUTILS_OBJ_H static const int MODUTILS_OBJ_H = 1; -#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $" - /* The relocatable object is manipulated using elfin types. */ #include -- 2.25.1