diff options
| author | Maciej Zenczykowski <maze@google.com> | 2011-04-04 15:32:39 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-04 15:32:39 +0200 |
| commit | 5e8f947becc00a79e78b2a6cf0e25fd674c57ec4 (patch) | |
| tree | 30792cb5caec11f39aa3a53ab2fcc78d1f80c5c4 | |
| parent | 2c6ac071a9c660b61a76565d1024d372deac8a98 (diff) | |
v4: rename init_extensions() to init_extensions4()
Signed-off-by: Maciej Zenczykowski <maze@google.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | extensions/GNUmakefile.in | 4 | ||||
| -rw-r--r-- | include/xtables.h.in | 1 | ||||
| -rw-r--r-- | iptables-restore.c | 2 | ||||
| -rw-r--r-- | iptables-save.c | 2 | ||||
| -rw-r--r-- | iptables-standalone.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index b96bd11f..84688d31 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -127,8 +127,8 @@ initext4.c: .initext4.dd for i in ${initext_func}; do \ echo "extern void lib$${i}_init(void);" >>$@; \ done; \ - echo "void init_extensions(void);" >>$@; \ - echo "void init_extensions(void)" >>$@; \ + echo "void init_extensions4(void);" >>$@; \ + echo "void init_extensions4(void)" >>$@; \ echo "{" >>$@; \ for i in ${initext_func}; do \ echo " ""lib$${i}_init();" >>$@; \ diff --git a/include/xtables.h.in b/include/xtables.h.in index c3d34af5..6abb2790 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -285,6 +285,7 @@ extern void xtables_save_string(const char *value); # define _init _INIT # endif extern void init_extensions(void); + extern void init_extensions4(void); #else # define _init __attribute__((constructor)) _INIT #endif diff --git a/iptables-restore.c b/iptables-restore.c index c2cc58c8..34a81563 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -140,7 +140,7 @@ main(int argc, char *argv[]) exit(1); } #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS) - init_extensions(); + init_extensions4(); #endif while ((c = getopt_long(argc, argv, "bcvthnM:T:", options, NULL)) != -1) { diff --git a/iptables-save.c b/iptables-save.c index 3e3ec43c..a0aa5d80 100644 --- a/iptables-save.c +++ b/iptables-save.c @@ -149,7 +149,7 @@ main(int argc, char *argv[]) exit(1); } #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS) - init_extensions(); + init_extensions4(); #endif while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) { diff --git a/iptables-standalone.c b/iptables-standalone.c index 1f60e314..38dd2c28 100644 --- a/iptables-standalone.c +++ b/iptables-standalone.c @@ -59,7 +59,7 @@ main(int argc, char *argv[]) exit(1); } #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS) - init_extensions(); + init_extensions4(); #endif ret = do_command(argc, argv, &table, &handle); |