Pull up 1.14 and 1.15

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index 7246925a9ba8271e8ebf030d67b397b934e40e7b..4386a7e2ff848af2da25d0454788d2ab106ee609 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -5,7 +5,8 @@
    Based on a configuration originally supplied by Jonathan Stone. */
 
 /*
- * Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.
+ * Copyright (c) 1996, 1998 The Internet Software Consortium.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -61,10 +62,15 @@ extern int h_errno;
 
 #include <net/if.h>
 #include <net/route.h>
-#include <linux/if_arp.h>
+
+#if defined (LINUX_1_X)
+# include <linux/if_arp.h>
+# include <linux/time.h>               /* also necessary */
+#else
+# include <net/if_arp.h>
+#endif
 
 #include <sys/time.h>          /* gettimeofday()*/
-#include <linux/time.h>                /* also necessary */
 
 #ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"