v4: rename init_extensions() to init_extensions4()

Signed-off-by: Maciej Zenczykowski <maze@google.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index b96bd11f403c3815bd5ac61b2f419f47775c2559..84688d31138eae62827aed4e4ab7993311046d29 100644 (file)
--- 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 c3d34af5f196a9b3ad4379e6151297e3fb225acd..6abb27907b2b8409344781b875ff82855b3ed2ab 100644 (file)
--- 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 c2cc58c864fa469bfabbe9297d2a3b4e1b87b72b..34a81563e425c445e959b7f08996e0fddc9b43bc 100644 (file)
--- 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 3e3ec43cfbeee15aef931ddaf49e647a75562885..a0aa5d8083054974c3c3b5d0cd3e77133df3c646 100644 (file)
--- 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 1f60e314c13ca741f36c95ea803d0cb829e7289a..38dd2c28426bc3cf6dbfb27b66e6e633ba006e24 100644 (file)
--- 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);