diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-01-21 22:21:43 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-01-21 22:21:43 +0000 |
| commit | e804c25cafdf47cc91627155f1389c81fa997eca (patch) | |
| tree | 115a2c1b4e339bc9c060e940ec6ae17826a0f7e0 /contrib/sendmail/src/conf.h | |
| parent | c5e098efbef941858129b84a112a036d572ba53c (diff) | |
| download | FreeBSD-src-e804c25cafdf47cc91627155f1389c81fa997eca.zip FreeBSD-src-e804c25cafdf47cc91627155f1389c81fa997eca.tar.gz | |
Repair 8.11.2 merge conflicts
Diffstat (limited to 'contrib/sendmail/src/conf.h')
| -rw-r--r-- | contrib/sendmail/src/conf.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index 1ef1427..0eeecba 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 8.496.4.25 2000/08/08 23:50:40 ca Exp $ + * $Id: conf.h,v 8.496.4.32 2000/12/15 19:20:53 gshapiro Exp $ */ /* $FreeBSD$ */ @@ -92,6 +92,7 @@ struct rusage; /* forward declaration to get gcc to shut up in wait.h */ #define MAXSHORTSTR 203 /* max short string length */ #define MAXMACNAMELEN 25 /* max macro name length */ #define MAXMACROID 0377 /* max macro id number */ + /* Must match (BITMAPBITS - 1) */ #ifndef MAXHDRSLEN # define MAXHDRSLEN (32 * 1024) /* max size of message headers */ #endif /* ! MAXHDRSLEN */ @@ -528,12 +529,19 @@ typedef int pid_t; # if SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) # define HASSNPRINTF 1 /* has snprintf starting in 2.6 */ # else /* SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) */ - typedef int int32_t; +# if _FFR_MILTER +# define SM_INT32 int /* 32bit integer */ +# endif /* _FFR_MILTER */ # endif /* SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) */ # if SOLARIS >= 20700 || (SOLARIS < 10000 && SOLARIS >= 207) # ifndef LA_TYPE # include <sys/loadavg.h> -# define LA_TYPE LA_SUBR /* getloadavg(3c) appears in 2.7 */ +# if SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209) +# include <sys/pset.h> +# define LA_TYPE LA_PSET /* pset_getloadavg(3c) appears in 2.9 */ +# else +# define LA_TYPE LA_SUBR /* getloadavg(3c) appears in 2.7 */ +# endif /* SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209) */ # endif /* ! LA_TYPE */ # define HASGETUSERSHELL 1 /* getusershell(3c) bug fixed in 2.7 */ # endif /* SOLARIS >= 20700 || (SOLARIS < 10000 && SOLARIS >= 207) */ @@ -1700,6 +1708,7 @@ typedef int pid_t; # define __svr4__ # define SYS5SIGNALS 1 # define HASSETSID 1 +# define HASSNPRINTF 1 # define HASSETREUID 1 # define HASWAITPID 1 # define HASGETDTABLESIZE 1 @@ -1719,6 +1728,7 @@ typedef int pid_t; # ifndef _PATH_SENDMAILPID # define _PATH_SENDMAILPID "/etc/sendmail.pid" # endif /* ! _PATH_SENDMAILPID */ +# undef offsetof /* avoid stddefs.h, sys/sysmacros.h conflict */ #endif /* __svr5__ */ /* ###################################################################### */ |
