[patch] 1.2.0-fix-gnusource-collisions.patch

fix-gnusource-collisions.patch (text/plain), 2.79 KB, created by Petre Rodan on 2009-09-09 08:01:21 UTC

diff -ur src/Makefile.am src/Makefile.am
--- src/Makefile.am	2009-04-03 01:53:39.000000000 +0300
+++ src/Makefile.am	2009-09-09 10:45:27.000000000 +0300
@@ -17,16 +17,16 @@
 
 sbin_PROGRAMS = dhcp6s dhcp6r dhcp6c
 
-dhcp6s_CFLAGS  = -fPIE -D_GNU_SOURCE
+dhcp6s_CFLAGS  = -fPIE
 dhcp6s_LDFLAGS = $(LDFLAGS)
 dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
                  server6_token.l $(COMMONSRCS)
 
-dhcp6r_CFLAGS  = -fPIE -D_GNU_SOURCE
+dhcp6r_CFLAGS  = -fPIE
 dhcp6r_LDFLAGS = $(LDFLAGS)
 dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
 
-dhcp6c_CFLAGS  = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
+dhcp6c_CFLAGS  = -fPIE $(LIBNL_CFLAGS)
 dhcp6c_LDFLAGS = $(LDFLAGS) $(LIBNL_LIBS)
 dhcp6c_SOURCES = dhcp6c.c confdata.c client6_addr.c client6_parse.y \
                  client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
diff -ur src/Makefile.in src/Makefile.in
--- src/Makefile.in	2009-04-03 05:45:17.000000000 +0300
+++ src/Makefile.in	2009-09-09 10:48:44.000000000 +0300
@@ -238,15 +238,15 @@
                 client6_parse.h server6_token.c client6_token.c \
                 resolv_token.c lease_token.c
 
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6s_CFLAGS = -fPIE
 dhcp6s_LDFLAGS = $(LDFLAGS)
 dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
                  server6_token.l $(COMMONSRCS)
 
-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6r_CFLAGS = -fPIE
 dhcp6r_LDFLAGS = $(LDFLAGS)
 dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
 dhcp6c_LDFLAGS = $(LDFLAGS) $(LIBNL_LIBS)
 dhcp6c_SOURCES = dhcp6c.c confdata.c client6_addr.c client6_parse.y \
                  client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
diff -ur src/dhcp6c.c src/dhcp6c.c
--- src/dhcp6c.c	2009-04-03 05:09:18.000000000 +0300
+++ src/dhcp6c.c	2009-09-09 10:42:32.000000000 +0300
@@ -75,6 +75,10 @@
 # include <netinet6/in6_var.h>
 #endif
 
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
 #include <linux/netlink.h>
 #include <netlink/socket.h>
 #include <netlink/route/rtnl.h>
diff -ur src/dhcp6s.c src/dhcp6s.c
--- src/dhcp6s.c	2009-04-03 05:10:11.000000000 +0300
+++ src/dhcp6s.c	2009-09-09 10:43:11.000000000 +0300
@@ -62,6 +62,10 @@
 # include <linux/sockios.h>
 #endif
 
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
 #include "dhcp6.h"
 #include "confdata.h"
 #include "common.h"
diff -ur src/relay6_socket.c src/relay6_socket.c
--- src/relay6_socket.c	2009-04-03 01:53:38.000000000 +0300
+++ src/relay6_socket.c	2009-09-09 10:43:54.000000000 +0300
@@ -47,6 +47,10 @@
 #define IPV6_2292PKTINFO IPV6_PKTINFO
 #endif
 
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
 extern FILE *dump;
 
 void init_socket() {