Move malloc.h into netbsd.h; define HAVE_SIN_LEN

diff --git a/cf/netbsd.h b/cf/netbsd.h
index d69ff1b82cdb58f1874a5ba25372214161c1a857..f78bbc7c0e98bd323e7faf47b79938d401c8e34a 100644 (file)
--- a/cf/netbsd.h
+++ b/cf/netbsd.h
@@ -40,6 +40,7 @@
 #include <string.h>
 #include <paths.h>
 #include <errno.h>
+#include <malloc.h>
 #include <unistd.h>
 #include <setjmp.h>
 #include <limits.h>
@@ -71,3 +72,5 @@ extern int h_errno;
 #define SET_TIME(x, y) (*(x) = (y))
 #define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
 #define SET_MAX_TIME(x)        (*(x) = INT_MAX)
+
+#define HAVE_SIN_LEN

diff --git a/cf/sunos4.h b/cf/sunos4.h
deleted file mode 100644 (file)
index fa97687..0000000
--- a/cf/sunos4.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* sunos4.h
-
-   System dependencies for SunOS 4 (tested on 4.1.4)... */
-
-/*
- * Copyright (c) 1995 RadioMail Corporation.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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
- *    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
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * RADIOMAIL CORPORATION 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)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * 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 software was written for RadioMail Corporation by Ted Lemon
- * under a contract with Vixie Enterprises, and is based on an earlier
- * design by Paul Vixie.
- */
-
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <netdb.h>
-extern int h_errno;
-
-#include <net/if.h>
-
-/* Varargs stuff... */
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-
-#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list)
-
-#define EOL    '\n'
-#define VOIDPTR        void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME struct timeval
-#define GET_TIME(x)    gettimeofday ((x), (struct timezone *)0)
-#define TIME_DIFF(high, low)                                           \
-  (((high) -> tv_sec == (low) -> tv_sec)                               \
-   ? ((high) -> tv_usec > (low) -> tv_usec                             \
-      ? 1 : (((high) -> tv_usec == (low) -> tv_usec) ? 0 : -1))                \
-   : (high) -> tv_sec - (low) -> tv_sec)
-#define SET_TIME(x, y) (((x) -> tv_sec = ((y))), ((x) -> tv_usec = 0))
-#define ADD_TIME(d, s1, s2) {                                          \
-                (d) -> tv_usec = (s1) -> tv_usec + (s2) -> tv_usec;    \
-                if ((d) -> tv_usec > 1000000 || (d) -> tv_usec < -1000000) { \
-                        (d) -> tv_sec = (d) -> tv_usec / 1000000;      \
-                        (d) -> tv_usec %= 1000000;                     \
-                } else                                                 \
-                        (d) -> tv_sec = 0;                             \
-                (d) -> tv_sec += (s1) -> tv_sec + (s2) -> tv_sec;      \
-       }
-#define SET_MAX_TIME(x)        (((x) -> tv_sec = INT_MAX),                     \
-                        ((x) -> tv_usec = 999999))

diff --git a/includes/cf/netbsd.h b/includes/cf/netbsd.h
index d69ff1b82cdb58f1874a5ba25372214161c1a857..f78bbc7c0e98bd323e7faf47b79938d401c8e34a 100644 (file)
--- a/includes/cf/netbsd.h
+++ b/includes/cf/netbsd.h
@@ -40,6 +40,7 @@
 #include <string.h>
 #include <paths.h>
 #include <errno.h>
+#include <malloc.h>
 #include <unistd.h>
 #include <setjmp.h>
 #include <limits.h>
@@ -71,3 +72,5 @@ extern int h_errno;
 #define SET_TIME(x, y) (*(x) = (y))
 #define ADD_TIME(d, s1, s2) (*(d) = *(s1) + *(s2))
 #define SET_MAX_TIME(x)        (*(x) = INT_MAX)
+
+#define HAVE_SIN_LEN

diff --git a/includes/cf/sunos4.h b/includes/cf/sunos4.h
deleted file mode 100644 (file)
index fa97687..0000000
--- a/includes/cf/sunos4.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* sunos4.h
-
-   System dependencies for SunOS 4 (tested on 4.1.4)... */
-
-/*
- * Copyright (c) 1995 RadioMail Corporation.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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
- *    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
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * RADIOMAIL CORPORATION 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)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * 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 software was written for RadioMail Corporation by Ted Lemon
- * under a contract with Vixie Enterprises, and is based on an earlier
- * design by Paul Vixie.
- */
-
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <netdb.h>
-extern int h_errno;
-
-#include <net/if.h>
-
-/* Varargs stuff... */
-#include <varargs.h>
-#define VA_DOTDOTDOT va_alist
-#define VA_start(list, last) va_start (list)
-
-#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list)
-
-#define EOL    '\n'
-#define VOIDPTR        void *
-
-/* Time stuff... */
-#include <sys/time.h>
-#define TIME struct timeval
-#define GET_TIME(x)    gettimeofday ((x), (struct timezone *)0)
-#define TIME_DIFF(high, low)                                           \
-  (((high) -> tv_sec == (low) -> tv_sec)                               \
-   ? ((high) -> tv_usec > (low) -> tv_usec                             \
-      ? 1 : (((high) -> tv_usec == (low) -> tv_usec) ? 0 : -1))                \
-   : (high) -> tv_sec - (low) -> tv_sec)
-#define SET_TIME(x, y) (((x) -> tv_sec = ((y))), ((x) -> tv_usec = 0))
-#define ADD_TIME(d, s1, s2) {                                          \
-                (d) -> tv_usec = (s1) -> tv_usec + (s2) -> tv_usec;    \
-                if ((d) -> tv_usec > 1000000 || (d) -> tv_usec < -1000000) { \
-                        (d) -> tv_sec = (d) -> tv_usec / 1000000;      \
-                        (d) -> tv_usec %= 1000000;                     \
-                } else                                                 \
-                        (d) -> tv_sec = 0;                             \
-                (d) -> tv_sec += (s1) -> tv_sec + (s2) -> tv_sec;      \
-       }
-#define SET_MAX_TIME(x)        (((x) -> tv_sec = INT_MAX),                     \
-                        ((x) -> tv_usec = 999999))