AUX compatibility

SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.32
SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.29

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 3eac87a..925e4cf 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.31 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.32 (Berkeley) %G%";

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


@@ -491,7 +491,7 @@ setsignal(sig, handler)
        int sig;
        setsig_t handler;
 {
        int sig;
        setsig_t handler;
 {

-#if defined(SYS5SIGNALS) || defined(BSD4_3)
+#if defined(SYS5SIGNALS) || defined(BSD4_3) || defined(_AUX_SOURCE)

        return signal(sig, handler);
 #else
        struct sigaction n, o;
        return signal(sig, handler);
 #else
        struct sigaction n, o;


@@ -1282,7 +1282,7 @@ vsprintf(s, fmt, ap)
 # if defined(IRIX) || defined(apollo) || defined(_SCO_unix_)
 #  include <sys/statfs.h>
 # else
 # if defined(IRIX) || defined(apollo) || defined(_SCO_unix_)
 #  include <sys/statfs.h>
 # else

-#  if (defined(sun) && !defined(BSD)) || defined(__hpux) || defined(_CONVEX_SOURCE) || defined(NeXT)
+#  if (defined(sun) && !defined(BSD)) || defined(__hpux) || defined(_CONVEX_SOURCE) || defined(NeXT) || defined(_AUX_SOURCE)

 #   include <sys/vfs.h>
 #  else
 #   include <sys/mount.h>
 #   include <sys/vfs.h>
 #  else
 #   include <sys/mount.h>

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 05fb329..bca2197 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.28 (Berkeley) %G%
+ *     @(#)conf.h      8.29 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -14,6 +14,7 @@
 
 # include <sys/param.h>
 # include <sys/stat.h>
 
 # include <sys/param.h>
 # include <sys/stat.h>

+# include <sys/file.h>

 # include <fcntl.h>
 # include <signal.h>
 
 # include <fcntl.h>
 # include <signal.h>
 


@@ -309,6 +310,7 @@ typedef int         pid_t;
 # define BSD           1       /* pretend to be BSD based today */
 # undef  NEEDVPRINTF   1       /* need a replacement for vprintf(3) */
 # define NEEDGETOPT    1       /* need a replacement for getopt(3) */
 # define BSD           1       /* pretend to be BSD based today */
 # undef  NEEDVPRINTF   1       /* need a replacement for vprintf(3) */
 # define NEEDGETOPT    1       /* need a replacement for getopt(3) */

+# define HASUNSETENV   1       /* has unsetenv(3) call */

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


@@ -337,6 +339,26 @@ typedef int                pid_t;
 #endif
 
 
 #endif
 
 

+/*
+**  Apple A/UX 3.0
+*/
+
+#ifdef _AUX_SOURCE
+# define BSD                   /* has BSD routines */
+# define HASSTATFS     1       /* has the statfs(2) syscall */
+# 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 FORK          fork
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF     "/usr/lib/sendmail.cf"
+# endif
+# ifndef LA_TYPE
+#  define LA_TYPE      LA_ZERO
+# endif
+#endif
+
+

 
 /**********************************************************************
 **  End of Per-Operating System defines
 
 /**********************************************************************
 **  End of Per-Operating System defines


@@ -501,10 +523,6 @@ struct utsname
 #define STDERR_FILENO  2
 #endif
 
 #define STDERR_FILENO  2
 #endif
 

-#ifdef HASFLOCK
-# include <sys/file.h>
-#endif
-

 #ifndef LOCK_SH
 # define LOCK_SH       0x01    /* shared lock */
 # define LOCK_EX       0x02    /* exclusive lock */
 #ifndef LOCK_SH
 # define LOCK_SH       0x01    /* shared lock */
 # define LOCK_EX       0x02    /* exclusive lock */