further compat changes for Solaris & other System-V derived systems

SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.7

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index d8fd500..d0dc5e8 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      8.6 (Berkeley) %G%
+ *     @(#)conf.h      8.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -66,16 +66,6 @@
 **     change these.
 **********************************************************************/
 
 **     change these.
 **********************************************************************/
 

-/* general "standard C" defines */
-#ifdef __STDC__
-# define HASSETVBUF    1       /* yes, we have setvbuf in libc */
-#endif
-
-/* general POSIX defines */
-#ifdef _POSIX_VERSION
-# define HASSETSID     1       /* has setsid(2) call */
-#endif
-

 /*
 **  Per-Operating System defines
 */
 /*
 **  Per-Operating System defines
 */


@@ -89,9 +79,6 @@
 # define UNSETENV      1       /* need unsetenv(3) support */
 # define HASSETREUID   1       /* have setreuid(2) call */
 # define setreuid(r, e)                setresuid(r, e, -1)     
 # define UNSETENV      1       /* need unsetenv(3) support */
 # define HASSETREUID   1       /* have setreuid(2) call */
 # define setreuid(r, e)                setresuid(r, e, -1)     

-# ifndef __STDC__
-#  define HASSETVBUF   1       /* we have setvbuf in libc (but not __STDC__) */
-# endif

 # endif
 
 /*
 # endif
 
 /*


@@ -130,11 +117,7 @@
 
 # ifdef SOLARIS
                        /* Solaris 2.x (a.k.a. SunOS 5.x) */
 
 # ifdef SOLARIS
                        /* Solaris 2.x (a.k.a. SunOS 5.x) */

-#  define LOCKF                1       /* use System V lockf instead of flock */
-#  define HASUSTAT     1       /* has the ustat(2) syscall */
-#  define bcopy(s, d, l)       (memmove((d), (s), (l)))
-#  define bzero(d, l)          (memset((d), '\0', (l)))
-#  define bcmp(s, d, l)                (memcmp((s), (d), (l)))
+#  define SYSTEM5      1       /* use System V definitions */

 #  include <sys/time.h>
 
 # else
 #  include <sys/time.h>
 
 # else


@@ -203,14 +186,31 @@
 **  End of Per-Operating System defines
 **********************************************************************/
 
 **  End of Per-Operating System defines
 **********************************************************************/
 

+/**********************************************************************
+**  More general defines
+**********************************************************************/
+

 /* general System V defines */
 # ifdef SYSTEM5
 /* general System V defines */
 # ifdef SYSTEM5

-# define LOCKF         1       /* use System V lockf instead of flock */
+# define LOCKF         1       /* use System V locking instead of flock */

 # define SYS5TZ                1       /* use System V style timezones */
 # define SYS5TZ                1       /* use System V style timezones */

-# define HASUNAME      1       /* use System V uname system call */
-# define NEEDGETDTABLESIZE 1   /* needs a replacement getdtablesize */
+# define HASUNAME      1       /* use System V uname(2) system call */
+# define HASUSTAT      1       /* use System V ustat(2) syscall */
+# define bcopy(s, d, l)                (memmove((d), (s), (l)))
+# define bzero(d, l)           (memset((d), '\0', (l)))
+# define bcmp(s, d, l)         (memcmp((s), (d), (l)))

 # endif
 
 # endif
 

+/* general "standard C" defines */
+#if defined(__STDC__) || defined(SYSTEM5)
+# define HASSETVBUF    1       /* we have setvbuf(3) in libc */
+#endif
+
+/* general POSIX defines */
+#ifdef _POSIX_VERSION
+# define HASSETSID     1       /* has setsid(2) call */
+#endif
+

 /*
 **  Due to a "feature" in some operating systems such as Ultrix 4.3 and
 **  HPUX 8.0, if you receive a "No route to host" message (ICMP message
 /*
 **  Due to a "feature" in some operating systems such as Ultrix 4.3 and
 **  HPUX 8.0, if you receive a "No route to host" message (ICMP message