From: Roland McGrath <roland@gnu.org>
Date: Mon, 21 Jun 1993 23:47:08 +0000 (+0000)
Subject: Formerly sysdeps/unix/sysv/sysv4/__sysconf.c.~3~
X-Git-Tag: glibc-2.16-ports-before-merge~4255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aca28d6c2711d73bcc51e3d0bf4099b7c366a870;p=thirdparty%2Fglibc.git

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 3e4e82c1ebc..0093e20badf 100644
--- 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