summaryrefslogtreecommitdiff
path: root/sysdeps/generic/sysconf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-12-19 00:21:23 +0000
committerUlrich Drepper <drepper@redhat.com>2001-12-19 00:21:23 +0000
commit9cddf9deda4c6ac0339d3aa4be3cceef4d8e9b6a (patch)
tree86e4e74103036dfd33acf4b0a91f20b137371d76 /sysdeps/generic/sysconf.c
parent46089c83d119050998387d7a8fb896514c92618b (diff)
Update.
2001-12-18 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (clone): Subtract stack bias from child stack pointer before passing it to clone syscall. 2001-12-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/posix/sysconf.c (__sysconf): Respect POSIX minimum for _SC_TZNAME_MAX. * sysdeps/generic/sysconf.c (__sysconf): Likewise. Reported by Thorsten Kukuk <kukuk@suse.de>. * sysdeps/unix/grantpt.c (grantpt): Correct typo in comment and add some casts. * sysdeps/unix/sysv/linux/grantpt.c: Make __unix_grantpt static. 2001-12-18 Thorsten Kukuk <kukuk@suse.de> * sysdeps/unix/sysv/linux/grantpt.c: Make errno results standard conforming: return EBADF if file descriptor is invalid and EINVAL if file descriptor is no valid tty. * login/tst-grantpt.c: New file. * login/Makefile (tests): Add tst-grantpt.
Diffstat (limited to 'sysdeps/generic/sysconf.c')
-rw-r--r--sysdeps/generic/sysconf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/generic/sysconf.c b/sysdeps/generic/sysconf.c
index 70f77b7a54..8816ddc682 100644
--- a/sysdeps/generic/sysconf.c
+++ b/sysdeps/generic/sysconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1993,1995,1996,1997,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,6 +21,7 @@
#include <unistd.h>
#include <time.h>
#include <limits.h>
+#include <sys/param.h>
#include <sys/sysinfo.h>
@@ -36,7 +37,7 @@ __sysconf (name)
return -1;
case _SC_TZNAME_MAX:
- return __tzname_max ();
+ return MAX (__tzname_max (), _POSIX_TZNAME_MAX);
case _SC_CHARCLASS_NAME_MAX:
#ifdef CHARCLASS_NAME_MAX