updates for Convex, NEWS-OS 4.1C (Sony), and UNIOS-B 1.6 (Omron)

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

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index ee2b5ff..b60db94 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.7 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -848,7 +848,7 @@ setproctitle(fmt, va_alist)
 void
 reapchild()
 {
 void
 reapchild()
 {

-# if defined(WIFEXITED) && !defined(__NeXT__)
+# ifdef HASWAITPID

        auto int status;
        int count;
        int pid;
        auto int status;
        int count;
        int pid;

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 3cff0e4..0626e86 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.9 (Berkeley) %G%
+ *     @(#)conf.h      8.10 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -197,6 +197,7 @@
 # define HASINITGROUPS 1       /* has initgroups(2) call */
 # define HASGETDTABLESIZE 1    /* we have getdtablesize(2) call */
 # define HASSETREUID   1       /* have setreuid(2) call */
 # define HASINITGROUPS 1       /* has initgroups(2) call */
 # define HASGETDTABLESIZE 1    /* we have getdtablesize(2) call */
 # define HASSETREUID   1       /* have setreuid(2) call */

+# define HASSETENV     1       /* has setenv(3) call */

 # define LA_TYPE       LA_FLOAT
 #endif
 
 # define LA_TYPE       LA_FLOAT
 #endif
 


@@ -254,6 +255,7 @@
 /* general POSIX defines */
 #ifdef _POSIX_VERSION
 # define HASSETSID     1       /* has setsid(2) call */
 /* general POSIX defines */
 #ifdef _POSIX_VERSION
 # define HASSETSID     1       /* has setsid(2) call */

+# define HASWAITPID    1       /* has waitpid(2) call */

 #endif
 
 /*
 #endif
 
 /*