Remove more headers

diff --git a/dhcp.c b/dhcp.c
index 67bb766351a2545a73bd995b4122b858e8f87f68..e863f37579af535f51615eb8d23149c3be9d0e81 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 

diff --git a/if-options.c b/if-options.c
index 8d83cbd3424088cdcf6494eabf13b90c3b0a9955..4322578039695cae81f926609f2424838558ea19 100644 (file)
--- a/if-options.c
+++ b/if-options.c
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/param.h>
 #include <sys/types.h>
 
 #include <arpa/inet.h>
@@ -32,6 +33,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
+#include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ipv6.c b/ipv6.c
index cae5c96f80876f734363da31e75d6c9e4ed1621b..c633cffe9e24d3710f35b8744255e439343c3777 100644 (file)
--- a/ipv6.c
+++ b/ipv6.c
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 

diff --git a/ipv6.h b/ipv6.h
index 96f968b536b50683774dbe1a9345e52fd7627c90..ab1ccb6dc246a73da602e4e12583ba8ec8d32c5e 100644 (file)
--- a/ipv6.h
+++ b/ipv6.h
@@ -28,7 +28,6 @@
 #ifndef IPV6_H
 #define IPV6_H
 
-#include <sys/param.h>
 #include <sys/queue.h>
 
 #include <netinet/in.h>
@@ -49,6 +48,10 @@
  * See the discussion here:
  *    http://mail-index.netbsd.org/tech-net/2013/03/15/msg004019.html
  */
+#ifndef __linux__
+/* We guard here to avoid breaking a compile on linux ppc-64 headers */
+#  include <sys/param.h>
+#endif
 #ifdef BSD
 #  define LISTEN_DAD
 #endif