v6: rename init_extensions() to init_extensions6()

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 84688d31138eae62827aed4e4ab7993311046d29..1419d76b95cbf777f7f7c5a04705972175537a4b 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -143,8 +143,8 @@ initext6.c: .initext6.dd
        for i in ${initext6_func}; do \
                echo "extern void lib$${i}_init(void);" >>$@; \
        done; \
-       echo "void init_extensions(void);" >>$@; \
-       echo "void init_extensions(void)" >>$@; \
+       echo "void init_extensions6(void);" >>$@; \
+       echo "void init_extensions6(void)" >>$@; \
        echo "{" >>$@; \
        for i in ${initext6_func}; do \
                echo " ""lib$${i}_init();" >>$@; \

diff --git a/include/xtables.h.in b/include/xtables.h.in
index 6abb27907b2b8409344781b875ff82855b3ed2ab..bb0a40c18d71d417334cac50b70674ff982ce901 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -286,6 +286,7 @@ extern void xtables_save_string(const char *value);
 #      endif
        extern void init_extensions(void);
        extern void init_extensions4(void);
+       extern void init_extensions6(void);
 #else
 #      define _init __attribute__((constructor)) _INIT
 #endif

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 10c3acfc5849c2efc2f6543716cb7163af9f87b9..48ff98ceba25ff5f1d976df15f9e309bdbcdc3dc 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
                exit(1);
        }
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
-       init_extensions();
+       init_extensions6();
 #endif
 
        while ((c = getopt_long(argc, argv, "bcvthnM:", options, NULL)) != -1) {

diff --git a/ip6tables-save.c b/ip6tables-save.c
index c3b8ec0d31af2cb1bbc2de1174fc2ca771cc7013..1a5e3c8c68933d3e69d78e74649b9a7248c58691 100644 (file)
--- a/ip6tables-save.c
+++ b/ip6tables-save.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
                exit(1);
        }
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
-       init_extensions();
+       init_extensions6();
 #endif
 
        while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {

diff --git a/ip6tables-standalone.c b/ip6tables-standalone.c
index 8661bd9cf35133a429ac1f98e02a1ba18c59ecb9..7d34684064b0915389fa01612d8979258fa6ecb8 100644 (file)
--- a/ip6tables-standalone.c
+++ b/ip6tables-standalone.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
        }
 
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
-       init_extensions();
+       init_extensions6();
 #endif
 
        ret = do_command6(argc, argv, &table, &handle);