Update.

	* posix/bits/posix2_lim.h: Set correct values for
	_POSIX2_COLL_WEIGHTS_MAX and _POSIX2_CHARCLASS_NAME_MAX.  Remove
	EQUIV_CLASS_MAX.

diff --git a/ChangeLog b/ChangeLog
index 27821a8..ac2d4d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * posix/bits/posix2_lim.h: Set correct values for
+       _POSIX2_COLL_WEIGHTS_MAX and _POSIX2_CHARCLASS_NAME_MAX.  Remove
+       EQUIV_CLASS_MAX.
+
        * posix/bits/posix1_lim.h: Define _POSIX_TZNAME_MAX as 6.
        Required by POSIX.
 

diff --git a/posix/bits/posix2_lim.h b/posix/bits/posix2_lim.h
index 927c017..f4b5c63 100644 (file)
--- a/posix/bits/posix2_lim.h
+++ b/posix/bits/posix2_lim.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1999, 2000, 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
@@ -37,9 +37,8 @@
 #define        _POSIX2_BC_STRING_MAX           1000
 
 /* The maximum number of weights that can be assigned to an entry of
-   the LC_COLLATE `order' keyword in the locale definition file.
-   We have no fixed limit, 255 is very high.  */
-#define        _POSIX2_COLL_WEIGHTS_MAX        255
+   the LC_COLLATE `order' keyword in the locale definition file.  */
+#define        _POSIX2_COLL_WEIGHTS_MAX        2
 
 /* The maximum number of expressions that can be nested
    within parentheses by the `expr' utility.  */
@@ -54,7 +53,7 @@
 
 /* The maximum number of bytes in a character class name.  We have no
    fixed limit, 2048 is a high number.  */
-#define        _POSIX2_CHARCLASS_NAME_MAX      2048
+#define        _POSIX2_CHARCLASS_NAME_MAX      14
 
 
 /* These values are implementation-specific,
@@ -74,10 +73,7 @@
 #define        BC_STRING_MAX           _POSIX2_BC_STRING_MAX
 #endif
 #ifndef        COLL_WEIGHTS_MAX
-#define        COLL_WEIGHTS_MAX        _POSIX2_COLL_WEIGHTS_MAX
-#endif
-#ifndef        EQUIV_CLASS_MAX
-#define        EQUIV_CLASS_MAX         _POSIX2_EQUIV_CLASS_MAX
+#define        COLL_WEIGHTS_MAX        255
 #endif
 #ifndef        EXPR_NEST_MAX
 #define        EXPR_NEST_MAX           _POSIX2_EXPR_NEST_MAX
@@ -86,7 +82,7 @@
 #define        LINE_MAX                _POSIX2_LINE_MAX
 #endif
 #ifndef        CHARCLASS_NAME_MAX
-#define        CHARCLASS_NAME_MAX      _POSIX2_CHARCLASS_NAME_MAX
+#define        CHARCLASS_NAME_MAX      2048
 #endif
 
 /* This value is defined like this in regex.h.  */