AIX compatibility changes; clean up map initialization functions

[unix-history] / usr / src / usr.sbin / sendmail / src / conf.h

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 31faa7b..bdf7596 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.30 (Berkeley) %G%
+ *     @(#)conf.h      6.31 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -42,10 +42,6 @@
 # define QUEUESIZE     1000            /* max # of jobs per queue run */
 # endif
 
 # define QUEUESIZE     1000            /* max # of jobs per queue run */
 # endif
 

-# ifndef FORK
-# define FORK          vfork           /* function to call to fork mailer */
-# endif
-

 /*
 **  Compilation options.
 **
 /*
 **  Compilation options.
 **


@@ -85,6 +81,11 @@
 # define SYSTEM5       1
 # endif
 
 # define SYSTEM5       1
 # endif
 

+# ifdef IBM_AIX
+# define LOCKF         1       /* use System V lockf instead of flock */
+# define FORK          fork    /* no vfork primitive available */
+# endif
+

 # ifdef SYSTEM5
 
 # define LOCKF         1       /* use System V lockf instead of flock */
 # ifdef SYSTEM5
 
 # define LOCKF         1       /* use System V lockf instead of flock */


@@ -232,3 +233,8 @@ struct utsname
 #ifndef TOBUFSIZE
 # define TOBUFSIZE (1024 - 256)
 #endif
 #ifndef TOBUFSIZE
 # define TOBUFSIZE (1024 - 256)
 #endif

+
+/* fork routine -- set above using #ifdef _osname_ or in Makefile */
+# ifndef FORK
+# define FORK          vfork           /* function to call to fork mailer */
+# endif