Don't redefine _PATH_DHCPD_xxx

diff --git a/cf/alphaosf.h b/cf/alphaosf.h
index 7aedf50f667d8d80fe53b276512a50ac5f3ba03e..6f154b4241b85b3ac89af9004a89def80db3d63a 100644 (file)
--- a/cf/alphaosf.h
+++ b/cf/alphaosf.h
@@ -67,7 +67,9 @@ extern int h_errno;
 #define VA_DOTDOTDOT va_alist
 #define VA_start(list, last) va_start (list)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/cf/bsdos.h b/cf/bsdos.h
index 7989645bf667df2dfca7153b89e300edec4e95e6..8af03e9b81adea7637327dbf8ae6036cb14e87f5 100644 (file)
--- a/cf/bsdos.h
+++ b/cf/bsdos.h
@@ -59,8 +59,12 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
 #define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/cf/freebsd.h b/cf/freebsd.h
index 0edf2381d3f846720402af4b893e0b30dde1bf25..618f74a4031563663b19d53609814cff004449d7 100644 (file)
--- a/cf/freebsd.h
+++ b/cf/freebsd.h
@@ -61,8 +61,12 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
 #define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/cf/netbsd.h b/cf/netbsd.h
index c520c924a3b51644fb4d698990416ba7fa042fd2..23f0b30da235609b606b6f0785f7bf0a94c40b52 100644 (file)
--- a/cf/netbsd.h
+++ b/cf/netbsd.h
@@ -59,8 +59,12 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
 #define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/cf/qnx.h b/cf/qnx.h
index 996ea97e2af8dceef64d657336f44486cd145cdf..a612758652fb89123a46a6cbcf3e7971e7735dcf 100644 (file)
--- a/cf/qnx.h
+++ b/cf/qnx.h
@@ -61,7 +61,9 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/cf/ultrix.h b/cf/ultrix.h
index 661bd081a5eaca5265619654f8c4b60945b2634b..2c881b96bf6ad241026394afe3c323d1c7d80b46 100644 (file)
--- a/cf/ultrix.h
+++ b/cf/ultrix.h
@@ -52,13 +52,6 @@ extern int h_errno;
 
 #include <net/if.h>
 
-/*#define _PATH_DHCPD_PID      "/var/run/dhcpd.pid"*/
-
-/*
- * Ultrix systems don't have /var/run, but some sites have added it.
- * if yours  is one, edit this file or define _PATH_DHCPD_PID externally.
- */
-
 #ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
 #endif

diff --git a/includes/cf/alphaosf.h b/includes/cf/alphaosf.h
index 7aedf50f667d8d80fe53b276512a50ac5f3ba03e..6f154b4241b85b3ac89af9004a89def80db3d63a 100644 (file)
--- a/includes/cf/alphaosf.h
+++ b/includes/cf/alphaosf.h
@@ -67,7 +67,9 @@ extern int h_errno;
 #define VA_DOTDOTDOT va_alist
 #define VA_start(list, last) va_start (list)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/includes/cf/bsdos.h b/includes/cf/bsdos.h
index 7989645bf667df2dfca7153b89e300edec4e95e6..8af03e9b81adea7637327dbf8ae6036cb14e87f5 100644 (file)
--- a/includes/cf/bsdos.h
+++ b/includes/cf/bsdos.h
@@ -59,8 +59,12 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
 #define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/includes/cf/freebsd.h b/includes/cf/freebsd.h
index 0edf2381d3f846720402af4b893e0b30dde1bf25..618f74a4031563663b19d53609814cff004449d7 100644 (file)
--- a/includes/cf/freebsd.h
+++ b/includes/cf/freebsd.h
@@ -61,8 +61,12 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
 #define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/includes/cf/netbsd.h b/includes/cf/netbsd.h
index c520c924a3b51644fb4d698990416ba7fa042fd2..23f0b30da235609b606b6f0785f7bf0a94c40b52 100644 (file)
--- a/includes/cf/netbsd.h
+++ b/includes/cf/netbsd.h
@@ -59,8 +59,12 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
 #define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/includes/cf/qnx.h b/includes/cf/qnx.h
index 996ea97e2af8dceef64d657336f44486cd145cdf..a612758652fb89123a46a6cbcf3e7971e7735dcf 100644 (file)
--- a/includes/cf/qnx.h
+++ b/includes/cf/qnx.h
@@ -61,7 +61,9 @@ extern int h_errno;
 #define va_dcl
 #define VA_start(list, last) va_start (list, last)
 
+#ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/includes/cf/ultrix.h b/includes/cf/ultrix.h
index 661bd081a5eaca5265619654f8c4b60945b2634b..2c881b96bf6ad241026394afe3c323d1c7d80b46 100644 (file)
--- a/includes/cf/ultrix.h
+++ b/includes/cf/ultrix.h
@@ -52,13 +52,6 @@ extern int h_errno;
 
 #include <net/if.h>
 
-/*#define _PATH_DHCPD_PID      "/var/run/dhcpd.pid"*/
-
-/*
- * Ultrix systems don't have /var/run, but some sites have added it.
- * if yours  is one, edit this file or define _PATH_DHCPD_PID externally.
- */
-
 #ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
 #endif