From 61025fbaf989a57ebf44f76d397fb895be0210ac Mon Sep 17 00:00:00 2001 From: Gaius Mulley Date: Thu, 9 Nov 2023 16:14:43 +0000 Subject: [PATCH] PR modula2/112110: fails to build on freebsd when compiling wrapclock.cc This patch fixes a mangled #if #endif conditional section within wrapclock.cc. The conditional section in wrapclock_timezone should return 0 rather than return timezone. libgm2/ChangeLog: PR modula2/112110 * libm2iso/wrapclock.cc (timezone): Return 0 if unable to get the timezone from the tm struct. Signed-off-by: Gaius Mulley --- libgm2/libm2iso/wrapclock.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libgm2/libm2iso/wrapclock.cc b/libgm2/libm2iso/wrapclock.cc index 1f4ca8c325d0..887e0b1500f7 100644 --- a/libgm2/libm2iso/wrapclock.cc +++ b/libgm2/libm2iso/wrapclock.cc @@ -233,16 +233,9 @@ EXPORT(timezone) (void) localtime_r (&time, &result); return result.tm_gmtoff; } - else -#endif #endif - { -#if defined(HAVE_TIMEZONE) - return timezone; -#else - return 0; #endif - } + return 0; } /* istimezone returns 1 if timezone in wrapclock.cc can resolve the -- 2.47.2