diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2004-02-14 21:53:31 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2004-02-14 21:53:31 +0000 |
commit | 238623a0204c90e8d61dbde7b3b499a5036f2e5d (patch) | |
tree | 136f3e97b372409d2104603a771ff37e36631243 /contrib/sendmail/include/sm | |
parent | 96b960fca637a0765d566591885b7d42576e723f (diff) | |
download | FreeBSD-src-238623a0204c90e8d61dbde7b3b499a5036f2e5d.zip FreeBSD-src-238623a0204c90e8d61dbde7b3b499a5036f2e5d.tar.gz |
Import sendmail 8.12.11
Diffstat (limited to 'contrib/sendmail/include/sm')
-rw-r--r-- | contrib/sendmail/include/sm/cdefs.h | 5 | ||||
-rw-r--r-- | contrib/sendmail/include/sm/conf.h | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/contrib/sendmail/include/sm/cdefs.h b/contrib/sendmail/include/sm/cdefs.h index bb5e4c1..7b06e79 100644 --- a/contrib/sendmail/include/sm/cdefs.h +++ b/contrib/sendmail/include/sm/cdefs.h @@ -6,7 +6,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: cdefs.h,v 1.15 2002/01/16 18:30:11 ca Exp $ + * $Id: cdefs.h,v 1.15.2.1 2003/12/05 22:44:17 ca Exp $ */ /* @@ -67,11 +67,14 @@ # if __GNUC__ >= 2 # if __GNUC__ == 2 && __GNUC_MINOR__ < 5 # define SM_DEAD(proto) volatile proto +# define SM_DEAD_D volatile # else /* __GNUC__ == 2 && __GNUC_MINOR__ < 5 */ # define SM_DEAD(proto) proto __attribute__((__noreturn__)) +# define SM_DEAD_D # endif /* __GNUC__ == 2 && __GNUC_MINOR__ < 5 */ # else /* __GNUC__ >= 2 */ # define SM_DEAD(proto) proto +# define SM_DEAD_D # endif /* __GNUC__ >= 2 */ # endif /* SM_DEAD */ diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h index 0653410..055b958 100644 --- a/contrib/sendmail/include/sm/conf.h +++ b/contrib/sendmail/include/sm/conf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 1.90.2.18 2003/08/20 22:27:44 ca Exp $ + * $Id: conf.h,v 1.90.2.20 2004/01/07 00:52:16 ca Exp $ */ /* @@ -437,6 +437,9 @@ typedef int pid_t; # if SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209) # define HASURANDOMDEV 1 /* /dev/[u]random added in S9 */ # endif /* SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209) */ +# if SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) +# define HASUNSETENV 1 /* unsetenv() added in S10 */ +# endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */ # ifndef HASGETUSERSHELL # define HASGETUSERSHELL 0 /* getusershell(3) causes core dumps pre-2.7 */ # endif /* ! HASGETUSERSHELL */ @@ -2254,8 +2257,8 @@ typedef struct msgb mblk_t; # undef HAVE_SYS_ERRLIST # define sys_errlist __sys_errlist # define sys_nerr __sys_nerr -# define major(dev) ((int)(((dev) >> 8) & 0xff) -# define minor(dev) ((int)((dev) & 0xff) +# define major(dev) ((int)(((dev) >> 8) & 0xff)) +# define minor(dev) ((int)((dev) & 0xff)) # endif /* defined(__INTERIX) */ |