mirror of
https://gitlab.isc.org/isc-projects/dhcp
synced 2025-08-29 13:28:14 +00:00
Fix copyright; lose old modemd time defs; lose BROKEN_TM_GMT; fix SNPRINTF compat; define basic integer types; lose __USE_BSD, which tickles a header incompatibility
This commit is contained in:
Ted Lemon
parent
dc7ee01d1f
commit
f57d2a5150
64
cf/linux.h
64
cf/linux.h
@ -1,21 +1,8 @@
|
||||
/* linux.h
|
||||
|
||||
System dependencies for Linux (compiles on 1.3.57+libc 5.2.18)... */
|
||||
System dependencies for Linux.
|
||||
|
||||
/*
|
||||
* Copyright 1996 The Board of Trustees of The Leland Stanford
|
||||
* Junior University. All Rights Reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this
|
||||
* software and its documentation for any purpose and without
|
||||
* fee is hereby granted, provided that the above copyright
|
||||
* notice appear in all copies. Stanford University
|
||||
* makes no representations about the suitability of this
|
||||
* software for any purpose. It is provided "as is" without
|
||||
* express or implied warranty.
|
||||
*
|
||||
* This file was contributed by Jonathan Stone.
|
||||
*/
|
||||
Based on a configuration originally supplied by Jonathan Stone. */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 The Internet Software Consortium. All rights reserved.
|
||||
@ -29,15 +16,15 @@
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of RadioMail Corporation nor the names of its
|
||||
* 3. Neither the name of The Internet Software Consortium nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY RADIOMAIL CORPORATION AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
|
||||
* CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
* RADIOMAIL CORPORATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* THE INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
@ -45,10 +32,18 @@
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* This file was contributed by Jonathan Stone.
|
||||
*/
|
||||
|
||||
#include <features.h>
|
||||
#undef __USE_BSD
|
||||
typedef char int8_t;
|
||||
typedef short int16_t;
|
||||
typedef long int32_t;
|
||||
|
||||
typedef unsigned char u_int8_t;
|
||||
typedef unsigned short u_int16_t;
|
||||
typedef unsigned long u_int32_t;
|
||||
|
||||
#include <syslog.h>
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
@ -66,48 +61,27 @@ extern int h_errno;
|
||||
#include <sys/time.h> /* gettimeofday()*/
|
||||
#include <linux/time.h> /* also necessary */
|
||||
|
||||
|
||||
|
||||
|
||||
#define _PATH_DHCPD_PID "/etc/dhcpd.pid"
|
||||
|
||||
|
||||
/* Varargs stuff... */
|
||||
#include <stdarg.h>
|
||||
#define VA_DOTDOTDOT ...
|
||||
#define VA_start(list, last) va_start (list, last)
|
||||
#define va_dcl
|
||||
|
||||
#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list)
|
||||
#define snprintf(buf, size, fmt, a1, a2, a3) \
|
||||
sprintf(buf, fmt, a1, a2, a3)
|
||||
#define NO_SNPRINTF
|
||||
|
||||
#define VOIDPTR void *
|
||||
|
||||
#define EOL '\n'
|
||||
|
||||
/*
|
||||
* Linux (1.3.57 with libc 5.3.18) doesn't seem to have tm_zone
|
||||
* or tm_gmtoff
|
||||
*/
|
||||
#define BROKEN_TM_GMT
|
||||
|
||||
/* Time stuff... */
|
||||
|
||||
/*
|
||||
* Time stuff...
|
||||
*
|
||||
* Definitions for an ISC DHCPD system that uses time_t
|
||||
* to represent time internally as opposed to, for example, struct timeval.)
|
||||
*/
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#define TIME time_t
|
||||
#define GET_TIME(x) time ((x))
|
||||
#define TIME_DIFF(high, low) (*(high) - *(low))
|
||||
#define SET_TIME(x, y) (*(x) = (y))
|
||||
#define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
|
||||
#define SET_MAX_TIME(x) (*(x) = INT_MAX)
|
||||
|
||||
#if defined (USE_DEFAULT_NETWORK)
|
||||
# define USE_SOCKETS
|
||||
|
||||
@ -1,21 +1,8 @@
|
||||
/* linux.h
|
||||
|
||||
System dependencies for Linux (compiles on 1.3.57+libc 5.2.18)... */
|
||||
System dependencies for Linux.
|
||||
|
||||
/*
|
||||
* Copyright 1996 The Board of Trustees of The Leland Stanford
|
||||
* Junior University. All Rights Reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this
|
||||
* software and its documentation for any purpose and without
|
||||
* fee is hereby granted, provided that the above copyright
|
||||
* notice appear in all copies. Stanford University
|
||||
* makes no representations about the suitability of this
|
||||
* software for any purpose. It is provided "as is" without
|
||||
* express or implied warranty.
|
||||
*
|
||||
* This file was contributed by Jonathan Stone.
|
||||
*/
|
||||
Based on a configuration originally supplied by Jonathan Stone. */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 The Internet Software Consortium. All rights reserved.
|
||||
@ -29,15 +16,15 @@
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of RadioMail Corporation nor the names of its
|
||||
* 3. Neither the name of The Internet Software Consortium nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY RADIOMAIL CORPORATION AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
|
||||
* CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
* RADIOMAIL CORPORATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* THE INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
@ -45,10 +32,18 @@
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* This file was contributed by Jonathan Stone.
|
||||
*/
|
||||
|
||||
#include <features.h>
|
||||
#undef __USE_BSD
|
||||
typedef char int8_t;
|
||||
typedef short int16_t;
|
||||
typedef long int32_t;
|
||||
|
||||
typedef unsigned char u_int8_t;
|
||||
typedef unsigned short u_int16_t;
|
||||
typedef unsigned long u_int32_t;
|
||||
|
||||
#include <syslog.h>
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
@ -66,48 +61,27 @@ extern int h_errno;
|
||||
#include <sys/time.h> /* gettimeofday()*/
|
||||
#include <linux/time.h> /* also necessary */
|
||||
|
||||
|
||||
|
||||
|
||||
#define _PATH_DHCPD_PID "/etc/dhcpd.pid"
|
||||
|
||||
|
||||
/* Varargs stuff... */
|
||||
#include <stdarg.h>
|
||||
#define VA_DOTDOTDOT ...
|
||||
#define VA_start(list, last) va_start (list, last)
|
||||
#define va_dcl
|
||||
|
||||
#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list)
|
||||
#define snprintf(buf, size, fmt, a1, a2, a3) \
|
||||
sprintf(buf, fmt, a1, a2, a3)
|
||||
#define NO_SNPRINTF
|
||||
|
||||
#define VOIDPTR void *
|
||||
|
||||
#define EOL '\n'
|
||||
|
||||
/*
|
||||
* Linux (1.3.57 with libc 5.3.18) doesn't seem to have tm_zone
|
||||
* or tm_gmtoff
|
||||
*/
|
||||
#define BROKEN_TM_GMT
|
||||
|
||||
/* Time stuff... */
|
||||
|
||||
/*
|
||||
* Time stuff...
|
||||
*
|
||||
* Definitions for an ISC DHCPD system that uses time_t
|
||||
* to represent time internally as opposed to, for example, struct timeval.)
|
||||
*/
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#define TIME time_t
|
||||
#define GET_TIME(x) time ((x))
|
||||
#define TIME_DIFF(high, low) (*(high) - *(low))
|
||||
#define SET_TIME(x, y) (*(x) = (y))
|
||||
#define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
|
||||
#define SET_MAX_TIME(x) (*(x) = INT_MAX)
|
||||
|
||||
#if defined (USE_DEFAULT_NETWORK)
|
||||
# define USE_SOCKETS
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user