From: Ted Lemon Date: Mon, 20 May 1996 00:40:59 +0000 (+0000) Subject: Fix copyrights; lose ether_hdr compat; define more basic int types; lose bogus time... X-Git-Tag: BETA-2~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9930d1df92057e3725341ee50a74ff083c1a8fa7;p=thirdparty%2Fdhcp.git Fix copyrights; lose ether_hdr compat; define more basic int types; lose bogus time defs --- diff --git a/cf/sunos4.h b/cf/sunos4.h index 04f11af6e..a0245b765 100644 --- a/cf/sunos4.h +++ b/cf/sunos4.h @@ -2,22 +2,6 @@ System dependencies for SunOS 4 (tested on 4.1.4)... */ - -/* - * 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. - */ - /* * Copyright (c) 1996 The Internet Software Consortium. All rights reserved. * @@ -30,15 +14,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) @@ -47,9 +31,17 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * + * This software was written for the Internet Software Consortium by Ted Lemon + * under a contract with Vixie Laboratories. */ -#define u_int8_t unsigned char /* Not quite POSIX... */ +/* Basic Integer Types not defined in SunOS headers... */ + +#define int8_t char +#define int16_t short +#define int32_t long + +#define u_int8_t unsigned char #define u_int16_t unsigned short #define u_int32_t unsigned long @@ -60,14 +52,6 @@ #define jdref(x) (x) #define jrefproto jmp_buf -/* struct ether_host source and destination are structs on SunOS. */ -#ifndef ETHER_SRC -# define ETHER_SRC(x) (&((x) -> ether_shost)) -#endif -#ifndef ETHER_DEST -# define ETHER_DEST(x) (&((x) -> ether_dhost)) -#endif - #include #include @@ -133,18 +117,7 @@ char *strerror PROTO ((int)); #define EOL '\n' #define VOIDPTR void * -/* - * Time stuff... - * - * Definitions for an ISC DHCPD system that uses time_t - * to represent time internally as opposed to, for example, struct timeval.) - */ - #include #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) diff --git a/includes/cf/sunos4.h b/includes/cf/sunos4.h index 04f11af6e..a0245b765 100644 --- a/includes/cf/sunos4.h +++ b/includes/cf/sunos4.h @@ -2,22 +2,6 @@ System dependencies for SunOS 4 (tested on 4.1.4)... */ - -/* - * 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. - */ - /* * Copyright (c) 1996 The Internet Software Consortium. All rights reserved. * @@ -30,15 +14,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) @@ -47,9 +31,17 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * + * This software was written for the Internet Software Consortium by Ted Lemon + * under a contract with Vixie Laboratories. */ -#define u_int8_t unsigned char /* Not quite POSIX... */ +/* Basic Integer Types not defined in SunOS headers... */ + +#define int8_t char +#define int16_t short +#define int32_t long + +#define u_int8_t unsigned char #define u_int16_t unsigned short #define u_int32_t unsigned long @@ -60,14 +52,6 @@ #define jdref(x) (x) #define jrefproto jmp_buf -/* struct ether_host source and destination are structs on SunOS. */ -#ifndef ETHER_SRC -# define ETHER_SRC(x) (&((x) -> ether_shost)) -#endif -#ifndef ETHER_DEST -# define ETHER_DEST(x) (&((x) -> ether_dhost)) -#endif - #include #include @@ -133,18 +117,7 @@ char *strerror PROTO ((int)); #define EOL '\n' #define VOIDPTR void * -/* - * Time stuff... - * - * Definitions for an ISC DHCPD system that uses time_t - * to represent time internally as opposed to, for example, struct timeval.) - */ - #include #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)