about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-01-04 17:14:58 +0000
committerRoland McGrath <roland@gnu.org>2006-01-04 17:14:58 +0000
commit8e856b5a9aeb2cf6c468b65be5a6efef2dd1bbb5 (patch)
treec8b54f7ed1ab43a2349b9b16b940700d5870c2dd /localedata
parente7cbb3a8c251898e69811ed198aba46e42d6113c (diff)
downloadglibc-8e856b5a9aeb2cf6c468b65be5a6efef2dd1bbb5.tar.gz
glibc-8e856b5a9aeb2cf6c468b65be5a6efef2dd1bbb5.tar.xz
glibc-8e856b5a9aeb2cf6c468b65be5a6efef2dd1bbb5.zip
* abi-tags (*-.*-syllable.*): New match, with ABI value 5.
	* elf/cache.c (print_entry): Match the Syllable ABI tag.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/tst-mbswcs1.c16
2 files changed, 14 insertions, 8 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 67a60bd8be..f4c29fc173 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-27  Roland McGrath  <roland@redhat.com>
+
+	* tst-ctype.c (main): Add some casts.
+
+	* tst-mbswcs1.c (main): Make BUF const.  Add casts in mbrtowc calls.
+
 2006-01-02  Andreas Jaeger  <aj@suse.de>
 
 	* locales/fi_FI: Fix date_fmt.
diff --git a/localedata/tst-mbswcs1.c b/localedata/tst-mbswcs1.c
index 93795beb9e..fb2ea84cdd 100644
--- a/localedata/tst-mbswcs1.c
+++ b/localedata/tst-mbswcs1.c
@@ -1,5 +1,5 @@
 /* Test restarting behaviour of mbrtowc.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Bruno Haible <haible@ilog.fr>.
 
@@ -37,7 +37,7 @@
 int
 main (void)
 {
-  unsigned char buf[6] = { 0x25,  0xe2, 0x82, 0xac,  0xce, 0xbb };
+  const unsigned char buf[6] = { 0x25,  0xe2, 0x82, 0xac,  0xce, 0xbb };
   mbstate_t state;
   wchar_t wc = 42;
   size_t n;
@@ -52,12 +52,12 @@ main (void)
 
   memset (&state, '\0', sizeof (state));
 
-  show (mbrtowc (&wc, buf + 0, 1, &state), 1, 37);
-  show (mbrtowc (&wc, buf + 1, 1, &state), -2, 37);
-  show (mbrtowc (&wc, buf + 2, 3, &state), 2, 8364);
-  show (mbrtowc (&wc, buf + 4, 1, &state), -2, 8364);
-  show (mbrtowc (&wc, buf + 5, 1, &state), 1, 955);
-  show (mbrtowc (&wc, buf + 5, 1, &state), -1, 955);
+  show (mbrtowc (&wc, (const char *) buf + 0, 1, &state), 1, 37);
+  show (mbrtowc (&wc, (const char *) buf + 1, 1, &state), -2, 37);
+  show (mbrtowc (&wc, (const char *) buf + 2, 3, &state), 2, 8364);
+  show (mbrtowc (&wc, (const char *) buf + 4, 1, &state), -2, 8364);
+  show (mbrtowc (&wc, (const char *) buf + 5, 1, &state), 1, 955);
+  show (mbrtowc (&wc, (const char *) buf + 5, 1, &state), -1, 955);
 
   return result;
 }