compile cleanup on various systems (mostly AUX)

SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.34
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 8.21
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 8.15
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.37

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index c783649..c92b3df 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.36 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.37 (Berkeley) %G%";

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


@@ -490,10 +490,10 @@ checkcompat(to, e)
 **     This is essentially old BSD "signal(3)".
 */
 
 **     This is essentially old BSD "signal(3)".
 */
 

-setsig_t
+sigfunc_t

 setsignal(sig, handler)
        int sig;
 setsignal(sig, handler)
        int sig;

-       setsig_t handler;
+       sigfunc_t handler;

 {
 #if defined(SYS5SIGNALS) || defined(BSD4_3) || defined(_AUX_SOURCE)
        return signal(sig, handler);
 {
 #if defined(SYS5SIGNALS) || defined(BSD4_3) || defined(_AUX_SOURCE)
        return signal(sig, handler);

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 6dbed6b..96fdd4b 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.33 (Berkeley) %G%
+ *     @(#)conf.h      8.34 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -355,6 +355,7 @@ typedef int         pid_t;
 # define HASUNAME      1       /* use System V uname(2) system call */
 # define HASUSTAT      1       /* use System V ustat(2) syscall */
 # define HASSETVBUF    1       /* we have setvbuf(3) in libc */
 # define HASUNAME      1       /* use System V uname(2) system call */
 # define HASUSTAT      1       /* use System V ustat(2) syscall */
 # define HASSETVBUF    1       /* we have setvbuf(3) in libc */

+# define SIGFUNC_DEFINED       /* sigfunc_t already defined */

 # define FORK          fork
 # ifndef _PATH_SENDMAILCF
 #  define _PATH_SENDMAILCF     "/usr/lib/sendmail.cf"
 # define FORK          fork
 # ifndef _PATH_SENDMAILCF
 #  define _PATH_SENDMAILCF     "/usr/lib/sendmail.cf"


@@ -550,6 +551,10 @@ struct utsname
 # define WIFEXITED(st)         (((st) & 0377) == 0)
 #endif
 
 # define WIFEXITED(st)         (((st) & 0377) == 0)
 #endif
 

+#ifndef SIGFUNC_DEFINED
+typedef void           (*sigfunc_t) __P((int));
+#endif
+

 /*
 **  Size of tobuf (deliver.c)
 **     Tweak this to match your syslog implementation.  It will have to
 /*
 **  Size of tobuf (deliver.c)
 **     Tweak this to match your syslog implementation.  It will have to

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 749ea47..b663c54 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -12,9 +12,9 @@
 
 #ifndef lint
 #ifdef DAEMON
 
 #ifndef lint
 #ifdef DAEMON

-static char sccsid[] = "@(#)daemon.c   8.14 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.15 (Berkeley) %G% (with daemon mode)";

 #else
 #else

-static char sccsid[] = "@(#)daemon.c   8.14 (Berkeley) %G% (without daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.15 (Berkeley) %G% (without daemon mode)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -143,7 +143,7 @@ getrequests()
        if (TcpRcvBufferSize > 0)
        {
                if (setsockopt(DaemonSocket, SOL_SOCKET, SO_RCVBUF,
        if (TcpRcvBufferSize > 0)
        {
                if (setsockopt(DaemonSocket, SOL_SOCKET, SO_RCVBUF,

-                              &TcpRcvBufferSize,
+                              (char *) &TcpRcvBufferSize,

                               sizeof(TcpRcvBufferSize)) < 0)
                        syserr("getrequests: setsockopt(SO_RCVBUF)");
        }
                               sizeof(TcpRcvBufferSize)) < 0)
                        syserr("getrequests: setsockopt(SO_RCVBUF)");
        }


@@ -401,7 +401,7 @@ gothostent:
                if (TcpSndBufferSize > 0)
                {
                        if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
                if (TcpSndBufferSize > 0)
                {
                        if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,

-                                      &TcpSndBufferSize,
+                                      (char *) &TcpSndBufferSize,

                                       sizeof(TcpSndBufferSize)) < 0)
                                syserr("makeconnection: setsockopt(SO_SNDBUF)");
                }
                                       sizeof(TcpSndBufferSize)) < 0)
                                syserr("makeconnection: setsockopt(SO_SNDBUF)");
                }

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

- *     @(#)sendmail.h  8.20 (Berkeley) %G%
+ *     @(#)sendmail.h  8.21 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,7 +15,7 @@
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint

-static char SmailSccsId[] =    "@(#)sendmail.h 8.20            %G%";
+static char SmailSccsId[] =    "@(#)sendmail.h 8.21            %G%";

 # endif
 # else /*  _DEFINE */
 # define EXTERN extern
 # endif
 # else /*  _DEFINE */
 # define EXTERN extern


@@ -910,8 +910,7 @@ extern bool         lockfile __P((int, char *, char *, int));
 extern char            *hostsignature __P((MAILER *, char *, ENVELOPE *));
 extern void            openxscript __P((ENVELOPE *));
 extern void            closexscript __P((ENVELOPE *));
 extern char            *hostsignature __P((MAILER *, char *, ENVELOPE *));
 extern void            openxscript __P((ENVELOPE *));
 extern void            closexscript __P((ENVELOPE *));

-typedef void           (*setsig_t) __P((int));
-extern setsig_t                setsignal __P((int, setsig_t));
+extern sigfunc_t       setsignal __P((int, sigfunc_t));

 
 /* ellipsis is a different case though */
 #ifdef __STDC__
 
 /* ellipsis is a different case though */
 #ifdef __STDC__