[tz] [PROPOSED 2/2] * private.h: Include stddef.h early enough so that on FreeBSD __BSD_VISIBLE is defined before use. (timezone): Do not define if not FreeBSD, or if FreeBSD 15+, or if in standard-compliance mode so __BSD_VISIBLE is not defined.

--- private.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/private.h b/private.h index 4599d0b9..f6f12aa2 100644 --- a/private.h +++ b/private.h @@ -194,18 +194,24 @@ ** Nested includes */ -/* If defining the 'timezone' variable, avoid a clash with FreeBSD's - 'timezone' function by renaming its declaration. */ -#if defined USG_COMPAT && USG_COMPAT == 2 +#include <stddef.h> + +/* If defining the 'timezone' variable a la POSIX, avoid clashing with the old + 'timezone' function of FreeBSD <= 14, by renaming the latter's declaration. + This hack can be removed after 2028-11-30, FreeBSD 14's expected EOL. */ +#if (defined __FreeBSD__ && __FreeBSD__ < 15 && defined __BSD_VISIBLE \ + && defined USG_COMPAT && USG_COMPAT == 2) # define timezone sys_timezone +# define timezone_defined #endif + #include <time.h> -#if defined USG_COMPAT && USG_COMPAT == 2 + +#ifdef timezone_defined # undef timezone +# undef timezone_defined #endif -#include <stddef.h> - #include <string.h> #if defined HAVE_STRNLEN && !HAVE_STRNLEN static size_t -- 2.51.0