diff options
Diffstat (limited to 'contrib/sendmail/include/sm')
| -rw-r--r-- | contrib/sendmail/include/sm/conf.h | 8 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/fdset.h | 1 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/gen.h | 4 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/ixlen.h | 1 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/notify.h | 7 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/os/sm_os_openbsd.h | 14 | ||||
| -rw-r--r-- | contrib/sendmail/include/sm/rpool.h | 2 |
7 files changed, 15 insertions, 22 deletions
diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h index be9f027cac33..43bb8cfb0411 100644 --- a/contrib/sendmail/include/sm/conf.h +++ b/contrib/sendmail/include/sm/conf.h @@ -473,8 +473,8 @@ typedef int pid_t; # ifndef HASGETUSERSHELL # define HASGETUSERSHELL 0 /* getusershell(3) causes core dumps pre-2.7 */ # endif -# if SOLARIS < 21200 -# define SIGWAIT_TAKES_1_ARG 1 /* S12 moves to UNIX V7 semantic */ +# if SOLARIS < 21140 +# define SIGWAIT_TAKES_1_ARG 1 /* S11.4 moves to UNIX V7 semantic */ # endif # else /* SOLARIS */ @@ -1575,9 +1575,11 @@ extern void *malloc(); # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,36)) && !defined(HASFCHMOD) # define HASFCHMOD 1 /* fchmod(2) */ # endif +# if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 19) && !defined(HAS_GETHOSTBYNAME2) +# define HAS_GETHOSTBYNAME2 1 +# endif # endif /* __linux__ */ - /* ** DELL SVR4 Issue 2.2, and others ** From Kimmo Suominen <kim@grendel.lut.fi> diff --git a/contrib/sendmail/include/sm/fdset.h b/contrib/sendmail/include/sm/fdset.h index b4a1e7dec87b..10f121779370 100644 --- a/contrib/sendmail/include/sm/fdset.h +++ b/contrib/sendmail/include/sm/fdset.h @@ -17,6 +17,7 @@ ** before. */ +#define SM_FD_CLR(fd, pfdset) FD_CLR(fd, pfdset) #define SM_FD_SET(fd, pfdset) FD_SET(fd, pfdset) #define SM_FD_ISSET(fd, pfdset) FD_ISSET(fd, pfdset) #define SM_FD_SETSIZE FD_SETSIZE diff --git a/contrib/sendmail/include/sm/gen.h b/contrib/sendmail/include/sm/gen.h index 4f2066fa7447..588c4b6fefca 100644 --- a/contrib/sendmail/include/sm/gen.h +++ b/contrib/sendmail/include/sm/gen.h @@ -89,4 +89,8 @@ typedef unsigned int SM_ATOMIC_UINT_T; # define _FFR_8BITENVADDR 1 #endif +#if _FFR_HAPROXY && !defined(_FFR_XCNCT) +# define _FFR_XCNCT 1 +#endif + #endif /* SM_GEN_H */ diff --git a/contrib/sendmail/include/sm/ixlen.h b/contrib/sendmail/include/sm/ixlen.h index c3090ee07bbe..16e17d6bdeac 100644 --- a/contrib/sendmail/include/sm/ixlen.h +++ b/contrib/sendmail/include/sm/ixlen.h @@ -27,6 +27,7 @@ extern int xleni __P((const char *)); # if USE_EAI extern bool asciistr __P((const char *)); +extern bool asciinstr __P((const char *, size_t)); extern int uxtext_unquote __P((const char *, char *, int)); extern char *sm_lowercase __P((const char *)); extern bool utf8_valid __P((const char *, size_t)); diff --git a/contrib/sendmail/include/sm/notify.h b/contrib/sendmail/include/sm/notify.h index 4256ea94e747..d2366db85ec1 100644 --- a/contrib/sendmail/include/sm/notify.h +++ b/contrib/sendmail/include/sm/notify.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Proofpoint, Inc. and its suppliers. + * Copyright (c) 2021 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -10,13 +10,10 @@ #ifndef SM_NOTIFY_H #define SM_NOTIFY_H -/* microseconds */ -#define SM_MICROS 1000000L - int sm_notify_init __P((int)); int sm_notify_start __P((bool, int)); int sm_notify_stop __P((bool, int)); int sm_notify_rcv __P((char *, size_t, long)); int sm_notify_snd __P((char *, size_t)); -#endif /* ! SM_MSG_H */ +#endif /* ! SM_NOTIFY_H */ diff --git a/contrib/sendmail/include/sm/os/sm_os_openbsd.h b/contrib/sendmail/include/sm/os/sm_os_openbsd.h index 21e0a1010852..6baa7494e1e0 100644 --- a/contrib/sendmail/include/sm/os/sm_os_openbsd.h +++ b/contrib/sendmail/include/sm/os/sm_os_openbsd.h @@ -18,20 +18,6 @@ #define SM_OS_NAME "openbsd" -/* -** Temporary HACK for newer icu4c versions which include stdbool.h: -** pretend that it is already included -** otherwise compilation will break because bool is then -** redefined between the prototype declaration and -** the function definition, e.g., -** lowercase.c: error: conflicting types for 'asciistr' -** ../../include/sm/ixlen.h:29:13: note: previous declaration is here -*/ - -#if USE_EAI && !SM_CONF_STDBOOL_H -# define _STDBOOL_H_ 1 -#endif - #define SM_CONF_SYS_CDEFS_H 1 #ifndef SM_CONF_SHM # define SM_CONF_SHM 1 diff --git a/contrib/sendmail/include/sm/rpool.h b/contrib/sendmail/include/sm/rpool.h index 833474d9c911..b4645d62cf5c 100644 --- a/contrib/sendmail/include/sm/rpool.h +++ b/contrib/sendmail/include/sm/rpool.h @@ -163,6 +163,8 @@ extern void * sm_rpool_malloc __P(( SM_RPOOL_T *_rpool, size_t _size)); +# define sm_rpool_malloc_tagged(rpool, size, file, line, group) sm_rpool_malloc(rpool, size) +# define sm_rpool_malloc_tagged_x(rpool, size, file, line, group) sm_rpool_malloc_x(rpool, size) # endif /* SM_HEAP_CHECK */ #if DO_NOT_USE_STRCPY |