From 49d8c5d564cad70c5c1bef2d5571e8e494454210 Mon Sep 17 00:00:00 2001 From: Maciej Zenczykowski Date: Mon, 4 Apr 2011 15:33:25 +0200 Subject: v6: rename init_extensions() to init_extensions6() Signed-off-by: Maciej Zenczykowski Signed-off-by: Patrick McHardy --- extensions/GNUmakefile.in | 4 ++-- include/xtables.h.in | 1 + ip6tables-restore.c | 2 +- ip6tables-save.c | 2 +- ip6tables-standalone.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 84688d31..1419d76b 100644 --- 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 6abb2790..bb0a40c1 100644 --- 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 10c3acfc..48ff98ce 100644 --- 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 c3b8ec0d..1a5e3c8c 100644 --- 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 8661bd9c..7d346840 100644 --- 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); -- cgit v1.2.3