IRIX64 and DG-UX updates

SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.123
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.119

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

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


@@ -950,6 +950,10 @@ init_md(argc, argv)
 
 #include <nlist.h>
 
 
 #include <nlist.h>
 

+#ifdef IRIX64
+# define nlist         nlist64
+#endif
+

 #ifndef LA_AVENRUN
 # ifdef SYSTEM5
 #  define LA_AVENRUN   "avenrun"
 #ifndef LA_AVENRUN
 # ifdef SYSTEM5
 #  define LA_AVENRUN   "avenrun"


@@ -1085,6 +1089,9 @@ int getla()
        dg_sys_info((long *)&load_info,
                DG_SYS_INFO_LOAD_INFO_TYPE, DG_SYS_INFO_LOAD_VERSION_0);
 
        dg_sys_info((long *)&load_info,
                DG_SYS_INFO_LOAD_INFO_TYPE, DG_SYS_INFO_LOAD_VERSION_0);
 

+        if (tTd(3, 1))
+                printf("getla: %d\n", (int) (load_info.one_minute + 0.5));
+

        return((int) (load_info.one_minute + 0.5));
 }
 
        return((int) (load_info.one_minute + 0.5));
 }
 

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 6c7dc97..99d46b6 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.122 (Berkeley) %G%
+ *     @(#)conf.h      8.123 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -154,8 +154,16 @@ extern int syslog(int, char *, ...);
 **  Silicon Graphics IRIX
 **
 **     Compiles on 4.0.1.
 **  Silicon Graphics IRIX
 **
 **     Compiles on 4.0.1.

+**
+**     Use IRIX64 instead of IRIX for 64-bit IRIX.
+**
+**     IRIX64 changes from Mark R. Levinson <ml@cvdev.rochester.edu>.

 */
 
 */
 

+#ifdef IRIX64
+# define IRIX
+#endif
+

 #ifdef IRIX
 # define SYSTEM5       1       /* this is a System-V derived system */
 # define HASSETREUID   1       /* has setreuid(2) call */
 #ifdef IRIX
 # define SYSTEM5       1       /* this is a System-V derived system */
 # define HASSETREUID   1       /* has setreuid(2) call */


@@ -167,7 +175,11 @@ extern int syslog(int, char *, ...);
 # define GIDSET_T      gid_t
 # define SFS_TYPE      SFS_4ARGS       /* four argument statfs() call */
 # define LA_TYPE       LA_INT
 # define GIDSET_T      gid_t
 # define SFS_TYPE      SFS_4ARGS       /* four argument statfs() call */
 # define LA_TYPE       LA_INT

-# define NAMELISTMASK  0x7fffffff      /* mask for nlist() values */
+# ifdef IRIX64
+#  define NAMELISTMASK 0x7fffffffffffffff      /* mask for nlist() values */
+# else
+#  define NAMELISTMASK 0x7fffffff              /* mask for nlist() values */
+# endif

 #endif
 
 
 #endif