about summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-13 22:01:00 +0000
committerRoland McGrath <roland@gnu.org>1996-05-13 22:01:00 +0000
commita5b7bf0e62e88494d82f7ca6474b6b8b669c1e98 (patch)
treedaaf2d03e20448bd425400c78ffcee8fa82d4f11 /locale
parent95a108f0baaa38911b02e90d1f8179fd08a01ac2 (diff)
downloadglibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.tar.gz
glibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.tar.xz
glibc-a5b7bf0e62e88494d82f7ca6474b6b8b669c1e98.zip
* configure.in (--with-fp): Note in help string that it's the default.
	* locale/programs/ld-ctype.c (struct locale_ctype_t): Use u_int32_t
	instead of unsigned int for map_collection_max and map_collection_act.

	* stdio-common/vfprintf.c [USE_IN_LIBIO] (flockfile, funlockfile):
	Macros removed; they are in <stdio.h>.
	* stdio-common/vfscanf.c: Likewise.

	`-include' to not complain before they exist.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-ctype.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 79e01ba69b..96124988ce 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -88,8 +88,8 @@ struct locale_ctype_t
 #define MAX_NR_CHARMAP 16
   const char *mapnames[MAX_NR_CHARMAP];
   u_int32_t *map_collection[MAX_NR_CHARMAP];
-  unsigned int map_collection_max[MAX_NR_CHARMAP];
-  unsigned int map_collection_act[MAX_NR_CHARMAP];
+  u_int32_t map_collection_max[MAX_NR_CHARMAP];
+  u_int32_t map_collection_act[MAX_NR_CHARMAP];
   size_t map_collection_nr;
   size_t last_map_idx;
   unsigned int from_map_char;
@@ -821,8 +821,7 @@ implementation limit: no more than %d character maps allowed"),
   ctype->mapnames[cnt] = name;
 
   if (max_chars == 0)
-    ctype->map_collection_max[cnt] = charset->mb_cur_max == 1 ? 256
-								      : 512;
+    ctype->map_collection_max[cnt] = charset->mb_cur_max == 1 ? 256 : 512;
   else
     ctype->map_collection_max[cnt] = max_chars;