47932511b3
- additional ipv6 network mask patch from Jan Engelhardt - spec file cleanup - removed old patches
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
diff -up iptables-1.4.1-rc2/include/xtables.h.in.nf_ext_init iptables-1.4.1-rc2/include/xtables.h.in
|
|
--- iptables-1.4.1-rc2/include/xtables.h.in.nf_ext_init 2008-06-05 14:13:49.000000000 +0200
|
|
+++ iptables-1.4.1-rc2/include/xtables.h.in 2008-06-05 14:14:03.000000000 +0200
|
|
@@ -199,13 +199,13 @@ extern void ip6parse_hostnetworkmask(con
|
|
extern void save_string(const char *value);
|
|
|
|
#ifdef NO_SHARED_LIBS
|
|
-# ifdef _INIT
|
|
-# undef _init
|
|
-# define _init _INIT
|
|
+# ifdef NF_EXT_INIT
|
|
+# undef nf_ext_init
|
|
+# define nf_ext_init NF_EXT_INIT
|
|
# endif
|
|
extern void init_extensions(void);
|
|
#else
|
|
-# define _init __attribute__((constructor)) _INIT
|
|
+# define nf_ext_init __attribute__((constructor)) NF_EXT_INIT
|
|
#endif
|
|
|
|
/* Present in both iptables.c and ip6tables.c */
|
|
diff -up iptables-1.4.1-rc2/include/xtables/internal.h.nf_ext_init iptables-1.4.1-rc2/include/xtables/internal.h
|
|
--- iptables-1.4.1-rc2/include/xtables/internal.h.nf_ext_init 2008-06-05 14:13:24.000000000 +0200
|
|
+++ iptables-1.4.1-rc2/include/xtables/internal.h 2008-06-05 14:13:26.000000000 +0200
|
|
@@ -61,6 +61,6 @@ extern struct xtables_match *find_match(
|
|
struct xtables_rule_match **match);
|
|
extern struct xtables_target *find_target(const char *name, enum xt_tryload);
|
|
|
|
-extern void _init(void);
|
|
+extern void nf_ext_init(void);
|
|
|
|
#endif /* _XTABLES_INTERNAL_H */
|