diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2020-10-26 17:52:28 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2020-10-26 17:52:28 +0000 |
| commit | f61a22193c0d088da51b411bb79e3d6f8a73765d (patch) | |
| tree | ebb135208850b4382b566a6d0ed5c0942d592e48 /contrib | |
| parent | d42a83b1a914e4c0db0a9070076883c1d2de9f3d (diff) | |
| download | src-test2-f61a22193c0d088da51b411bb79e3d6f8a73765d.tar.gz src-test2-f61a22193c0d088da51b411bb79e3d6f8a73765d.zip | |
Key decleration of union semun on src version
__FreeBSD__ is defined by the compiler derived from the triple. When
building FreeBSD 11 on a FreeBSD 12 with a CROSS_TOOLCHAIN=llvm10,
__FreeBSD__ was set to 12 when building lib32 (for some reason no triple
is being passed which seems to mean that we're taking default values
from the build system). This in turn meant we end up with a double
decleration of union semun which is a build error.
Reviewed by: gshapiro, dim
Differential Revision: https://reviews.freebsd.org/D26902
Notes
Notes:
svn path=/head/; revision=367063
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/sendmail/include/sm/os/sm_os_freebsd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/include/sm/os/sm_os_freebsd.h b/contrib/sendmail/include/sm/os/sm_os_freebsd.h index 7c52edfe029f..9c355c9be8e0 100644 --- a/contrib/sendmail/include/sm/os/sm_os_freebsd.h +++ b/contrib/sendmail/include/sm/os/sm_os_freebsd.h @@ -32,8 +32,8 @@ # define SM_CONF_SHM 1 #endif #ifndef SM_CONF_SEM -# if __FreeBSD__ > 11 -# define SM_CONF_SEM 2 /* union semun is now longer available by default */ +# if __FreeBSD_version >= 1200059 +# define SM_CONF_SEM 2 /* union semun is no longer declared by default */ # else # define SM_CONF_SEM 1 # endif |