Linux portability hacks

diff --git a/cf/linux.h b/cf/linux.h
index e7b7c47213a15b8f1cce06127b83b75eec1f2dbc..0674727bc592efd9f5c56ff3cf8e9218c0b4cc53 100644 (file)
--- a/cf/linux.h
+++ b/cf/linux.h
@@ -56,16 +56,20 @@ typedef unsigned long u_int32_t;
 #include <signal.h>
 #include <setjmp.h>
 #include <limits.h>
-#include <linux/netdevice.h>
 
 extern int h_errno;
 
 #include <net/if.h>
-#include <linux/if_arp.h>
+
+#define ARPHRD_ETHER   1
+#define        ARPHRD_IEEE802  6
+
 #include <sys/time.h>          /* gettimeofday()*/
 #include <linux/time.h>                /* also necessary */
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
 
 /* Varargs stuff... */
 #include <stdarg.h>

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index e7b7c47213a15b8f1cce06127b83b75eec1f2dbc..0674727bc592efd9f5c56ff3cf8e9218c0b4cc53 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -56,16 +56,20 @@ typedef unsigned long u_int32_t;
 #include <signal.h>
 #include <setjmp.h>
 #include <limits.h>
-#include <linux/netdevice.h>
 
 extern int h_errno;
 
 #include <net/if.h>
-#include <linux/if_arp.h>
+
+#define ARPHRD_ETHER   1
+#define        ARPHRD_IEEE802  6
+
 #include <sys/time.h>          /* gettimeofday()*/
 #include <linux/time.h>                /* also necessary */
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
 
 /* Varargs stuff... */
 #include <stdarg.h>