aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-08-22 05:41:57 +0000
committerEric Andersen <andersen@codepoet.org>2001-08-22 05:41:57 +0000
commit1071ccfd25ec2c218c9d87da98282620e5356626 (patch)
tree6e00fa282f46ce7d4e379f63d51c7e112ac2634c
parentc0f9d0dce7a4d1ef1b2fd19f98fc0ec94c3887e4 (diff)
downloadbusybox-w32-1071ccfd25ec2c218c9d87da98282620e5356626.tar.gz
busybox-w32-1071ccfd25ec2c218c9d87da98282620e5356626.tar.bz2
busybox-w32-1071ccfd25ec2c218c9d87da98282620e5356626.zip
Force BB_FEATURE_NEW_MODULE_INTERFACE and BB_FEATURE_OLD_MODULE_INTERFACE
to be mutually exclusive
-rw-r--r--insmod.c5
-rw-r--r--modutils/insmod.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/insmod.c b/insmod.c
index 34be00b32..6b81ca754 100644
--- a/insmod.c
+++ b/insmod.c
@@ -67,6 +67,7 @@
67#include "busybox.h" 67#include "busybox.h"
68 68
69#ifdef BB_FEATURE_NEW_MODULE_INTERFACE 69#ifdef BB_FEATURE_NEW_MODULE_INTERFACE
70# undef BB_FEATURE_OLD_MODULE_INTERFACE
70# define new_sys_init_module init_module 71# define new_sys_init_module init_module
71#else 72#else
72# define old_sys_init_module init_module 73# define old_sys_init_module init_module
@@ -133,7 +134,7 @@
133#ifndef MODUTILS_MODULE_H 134#ifndef MODUTILS_MODULE_H
134static const int MODUTILS_MODULE_H = 1; 135static const int MODUTILS_MODULE_H = 1;
135 136
136#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $" 137#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 andersen Exp $"
137 138
138/* This file contains the structures used by the 2.0 and 2.1 kernels. 139/* This file contains the structures used by the 2.0 and 2.1 kernels.
139 We do not use the kernel headers directly because we do not wish 140 We do not use the kernel headers directly because we do not wish
@@ -350,7 +351,7 @@ int delete_module(const char *);
350#ifndef MODUTILS_OBJ_H 351#ifndef MODUTILS_OBJ_H
351static const int MODUTILS_OBJ_H = 1; 352static const int MODUTILS_OBJ_H = 1;
352 353
353#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $" 354#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 andersen Exp $"
354 355
355/* The relocatable object is manipulated using elfin types. */ 356/* The relocatable object is manipulated using elfin types. */
356 357
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 34be00b32..6b81ca754 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -67,6 +67,7 @@
67#include "busybox.h" 67#include "busybox.h"
68 68
69#ifdef BB_FEATURE_NEW_MODULE_INTERFACE 69#ifdef BB_FEATURE_NEW_MODULE_INTERFACE
70# undef BB_FEATURE_OLD_MODULE_INTERFACE
70# define new_sys_init_module init_module 71# define new_sys_init_module init_module
71#else 72#else
72# define old_sys_init_module init_module 73# define old_sys_init_module init_module
@@ -133,7 +134,7 @@
133#ifndef MODUTILS_MODULE_H 134#ifndef MODUTILS_MODULE_H
134static const int MODUTILS_MODULE_H = 1; 135static const int MODUTILS_MODULE_H = 1;
135 136
136#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $" 137#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 andersen Exp $"
137 138
138/* This file contains the structures used by the 2.0 and 2.1 kernels. 139/* This file contains the structures used by the 2.0 and 2.1 kernels.
139 We do not use the kernel headers directly because we do not wish 140 We do not use the kernel headers directly because we do not wish
@@ -350,7 +351,7 @@ int delete_module(const char *);
350#ifndef MODUTILS_OBJ_H 351#ifndef MODUTILS_OBJ_H
351static const int MODUTILS_OBJ_H = 1; 352static const int MODUTILS_OBJ_H = 1;
352 353
353#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $" 354#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 andersen Exp $"
354 355
355/* The relocatable object is manipulated using elfin types. */ 356/* The relocatable object is manipulated using elfin types. */
356 357