Solaris portability changes

SCCS-vsn: usr.sbin/sendmail/src/clock.c 6.4
SCCS-vsn: usr.sbin/sendmail/src/conf.h 6.36

diff --git a/usr/src/usr.sbin/sendmail/src/clock.c b/usr/src/usr.sbin/sendmail/src/clock.c
index dba90cb..62f51cd 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/clock.c
+++ b/usr/src/usr.sbin/sendmail/src/clock.c
@@ -7,12 +7,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)clock.c    6.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)clock.c    6.4 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 # include <signal.h>
 
 #endif /* not lint */
 
 # include "sendmail.h"
 # include <signal.h>
 

+# ifndef sigmask
+#  define sigmask(s)   (1 << ((s) - 1))
+# endif
+

 /*
 **  SETEVENT -- set an event to happen at a specific time.
 **
 /*
 **  SETEVENT -- set an event to happen at a specific time.
 **

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 4941bca..6ca89b0 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      6.35 (Berkeley) %G%
+ *     @(#)conf.h      6.36 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -87,9 +87,13 @@
 
 #if defined(sun) && !defined(BSD)
 # define UNSETENV      1       /* need unsetenv(3) support */
 
 #if defined(sun) && !defined(BSD)
 # define UNSETENV      1       /* need unsetenv(3) support */

-# define HASSTATFS     1       /* has the statfs(2) syscall */

 
 

-# if !defined(SOLARIS)
+# ifdef SOLARIS
+#  define LOCKF                1       /* use System V lockf instead of flock */
+#  define UNSETENV     1       /* need unsetenv(3) support */
+#  define HASUSTAT     1       /* has the ustat(2) syscall */
+# else
+#  define HASSTATFS    1       /* has the statfs(2) syscall */

 #  include <vfork.h>
 # endif
 
 #  include <vfork.h>
 # endif