Update.

	* sysdeps/unix/sysv/linux/bits/local_lim.h: Undefine OPEN_MAX
	unless user defined it.

2 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 25fdebf065..c938e5799a 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: Undefine OPEN_MAX
+	unless user defined it.
+
 	* sysdeps/unix/sysv/linux/bits/local_lim.h: Also undefine LINK_MAX
 	if not defined by the user.
 
diff --git a/sysdeps/unix/sysv/linux/bits/local_lim.h b/sysdeps/unix/sysv/linux/bits/local_lim.h
index 7d63461137..e9d8182193 100644
--- a/sysdeps/unix/sysv/linux/bits/local_lim.h
+++ b/sysdeps/unix/sysv/linux/bits/local_lim.h
@@ -18,14 +18,19 @@
    Boston, MA 02111-1307, USA.  */
 
 /* 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.  */
+   and defines LINK_MAX although filesystems have different maxima.  A
+   similar thing is true for OPEN_MAX: the limit can be changed at
+   runtime and therefore the macro must not be defined.  Remove this
+   after including the header if necessary.  */
 #ifndef NR_OPEN
 # define __undef_NR_OPEN
 #endif
 #ifndef LINK_MAX
 # define __undef_LINK_MAX
 #endif
+#ifndef OPEN_MAX
+# define __undef_OPEN_MAX
+#endif
 
 /* The kernel sources contain a file with all the needed information.  */
 #include <linux/limits.h>
@@ -40,6 +45,11 @@
 # undef LINK_MAX
 # undef __undef_LINK_MAX
 #endif
+/* Have to remove OPEN_MAX?  */
+#ifdef __undef_OPEN_MAX
+# undef OPEN_MAX
+# undef __undef_OPEN_MAX
+#endif
 
 /* Maximum amount by which a process can descrease its asynchronous I/O
    priority level.  */