Formerly sysdeps/unix/sysv/sysv4/__sysconf.c.~3~

diff --git a/sysdeps/unix/sysv/sysv4/sysconf.c b/sysdeps/unix/sysv/sysv4/sysconf.c
index 3e4e82c1ebc3b089b2364909ce73d5e78752008d..0093e20badf25134a502707fe1b42fd12709ec23 100644 (file)
--- a/sysdeps/unix/sysv/sysv4/sysconf.c
+++ b/sysdeps/unix/sysv/sysv4/sysconf.c
@@ -66,7 +66,11 @@ DEFUN(__sysconf, (name), int name)
       return __sysconfig (_CONFIG_OPEN_FILES);
 
     case _SC_TZNAME_MAX:
-      return __tzname_max ();
+#ifdef TZNAME_MAX
+      return __tzname_max > TZNAME_MAX ? __tzname_max : TZNAME_MAX;
+#else
+      return __tzname_max;
+#endif
 
     case _SC_JOB_CONTROL:
 #ifdef _POSIX_JOB_CONTROL