Date: Tue, 3 Nov 2020 23:27:24 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r367313 - stable/11/contrib/sendmail/include/sm/os Message-ID: <202011032327.0A3NRO1i069116@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Nov 3 23:27:24 2020 New Revision: 367313 URL: https://svnweb.freebsd.org/changeset/base/367313 Log: MFC r367063: 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 Modified: stable/11/contrib/sendmail/include/sm/os/sm_os_freebsd.h Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/sendmail/include/sm/os/sm_os_freebsd.h ============================================================================== --- stable/11/contrib/sendmail/include/sm/os/sm_os_freebsd.h Tue Nov 3 23:26:26 2020 (r367312) +++ stable/11/contrib/sendmail/include/sm/os/sm_os_freebsd.h Tue Nov 3 23:27:24 2020 (r367313) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011032327.0A3NRO1i069116>