aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-08 06:32:43 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-08 06:32:43 +0000
commit104d06900c76cb7211d1b5556fb20292098335a8 (patch)
tree3c7f0f5ba32cdfffe8adc848c50fb4f86bc3bfd5
parenta27c96b0b15a9582137436dd58f510da02483b8d (diff)
downloadglibc-104d06900c76cb7211d1b5556fb20292098335a8.zip
glibc-104d06900c76cb7211d1b5556fb20292098335a8.tar.gz
glibc-104d06900c76cb7211d1b5556fb20292098335a8.tar.bz2
Update.
* sysdeps/unix/sysv/linux/bits/local_lim.h: Also undefine LINK_MAX if not defined by the user.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/bits/local_lim.h13
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e73b97b..25fdebf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-07 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/bits/local_lim.h: Also undefine LINK_MAX
+ if not defined by the user.
+
* libio/iofwrite_u.c (fwrite_unlocked): Remove obsolete comment.
* libio/iofwrite.c (_IO_fwrite): Likewise.
diff --git a/sysdeps/unix/sysv/linux/bits/local_lim.h b/sysdeps/unix/sysv/linux/bits/local_lim.h
index 9c69e4b..7d63461 100644
--- a/sysdeps/unix/sysv/linux/bits/local_lim.h
+++ b/sysdeps/unix/sysv/linux/bits/local_lim.h
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux version.
- Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+ Copyright (C) 1993, 94, 95, 96, 97, 98, 2000 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
@@ -17,11 +17,15 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* The kernel header pollutes the namespace with the NR_OPEN symbol.
+/* The kernel header pollutes the namespace with the NR_OPEN symbol
+ and defines LINK_MAX although filesystems have different maxima.
Remove this after including the header if necessary. */
#ifndef NR_OPEN
# define __undef_NR_OPEN
#endif
+#ifndef LINK_MAX
+# define __undef_LINK_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -31,6 +35,11 @@
# undef NR_OPEN
# undef __undef_NR_OPEN
#endif
+/* Have to remove LINK_MAX? */
+#ifdef __undef_LINK_MAX
+# undef LINK_MAX
+# undef __undef_LINK_MAX
+#endif
/* Maximum amount by which a process can descrease its asynchronous I/O
priority level. */