From: Ted Lemon Date: Wed, 11 Sep 1996 06:36:57 +0000 (+0000) Subject: Don't redefine _PATH_DHCPD_xxx X-Git-Tag: BETA_5_10~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=911af7a5cb2ad4c5796fd66c63f1555ebe4bc2ff;p=thirdparty%2Fdhcp.git Don't redefine _PATH_DHCPD_xxx --- diff --git a/cf/alphaosf.h b/cf/alphaosf.h index 7aedf50f6..6f154b424 100644 --- 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 7989645bf..8af03e9b8 100644 --- 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 0edf2381d..618f74a40 100644 --- 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 c520c924a..23f0b30da 100644 --- 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 996ea97e2..a61275865 100644 --- 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 661bd081a..2c881b96b 100644 --- a/cf/ultrix.h +++ b/cf/ultrix.h @@ -52,13 +52,6 @@ extern int h_errno; #include -/*#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 7aedf50f6..6f154b424 100644 --- 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 7989645bf..8af03e9b8 100644 --- 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 0edf2381d..618f74a40 100644 --- 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 c520c924a..23f0b30da 100644 --- 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 996ea97e2..a61275865 100644 --- 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 661bd081a..2c881b96b 100644 --- a/includes/cf/ultrix.h +++ b/includes/cf/ultrix.h @@ -52,13 +52,6 @@ extern int h_errno; #include -/*#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