From 2ccd3de631733fcea8c32a96c5994a9c99bf7583 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 16:13:04 +0200 Subject: [GCC4] fix build error in net/ipv6/sysctl_net_ipv6.c This patch fixes these errors with gcc 4 : sysctl_net_ipv6.c:38: error: non-static declaration of 'ipv6_root_table' follows static declaration sysctl_net_ipv6.c:34: error: previous declaration of 'ipv6_root_table' was here sysctl_net_ipv6.c:43: error: non-static declaration of 'ipv6_net_table' follows static declaration sysctl_net_ipv6.c:35: error: previous declaration of 'ipv6_net_table' was here --- net/ipv6/sysctl_net_ipv6.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index b227d01..6c8e39d 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c @@ -31,17 +31,14 @@ ctl_table ipv6_table[] = { #ifdef MODULE static struct ctl_table_header *ipv6_sysctl_header; -static struct ctl_table ipv6_root_table[]; -static struct ctl_table ipv6_net_table[]; - -ctl_table ipv6_root_table[] = { - {CTL_NET, "net", NULL, 0, 0555, ipv6_net_table}, +static ctl_table ipv6_net_table[] = { + {NET_IPV6, "ipv6", NULL, 0, 0555, ipv6_table}, {0} }; -ctl_table ipv6_net_table[] = { - {NET_IPV6, "ipv6", NULL, 0, 0555, ipv6_table}, +static ctl_table ipv6_root_table[] = { + {CTL_NET, "net", NULL, 0, 0555, ipv6_net_table}, {0} }; -- 1.4.2