about summary refs log tree commit diff
path: root/posix/regex_internal.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-26 01:32:44 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-26 01:32:44 +0000
commit17568537740cb4bbeb28608a8ae6ba7a4fcf80c9 (patch)
treeadd616e1fb16331a69de439dd513ae6b13625f0a /posix/regex_internal.c
parentd024596d616ed20e04dcfacc06bd77d8d1e2b64b (diff)
downloadglibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar.gz
glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar.xz
glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.zip
Update.
2004-02-24  Arnold D. Robbins  <arnold@skeeve.com>

	* posix/regex_internal.c (build_wcs_upper_buffer): Enclose
	`offsets_needed' label in `#ifdef _LIBC' to silence `unused label'
	compiler warning.

2004-02-24  Nelson H.F. Beebe  <beebe@math.utah.edu>

	* posix/regex_internal.c (build_wcs_buffer): Add cast to char* in call
	to `wcrtomb'.
	* posix/regex_internal.h (bitset_not, bitset_merge, bitset_not_merge,
	bitset_mask, re_string_char_size_a, re_string_wchar_at,
	re_string_elem_size_at): Change to use prototypes.
	(re_string_char_size_at, re_string_wchar_at,
	re_string_elem_size_at): Declare as `internal_function'.
Diffstat (limited to 'posix/regex_internal.c')
-rw-r--r--posix/regex_internal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index ed26908ad1..a3dcfbbb65 100644
--- a/posix/regex_internal.c
+++ b/posix/regex_internal.c
@@ -373,7 +373,9 @@ build_wcs_upper_buffer (pstr)
       {
 	wchar_t wc;
 	const char *p;
+#ifdef _LIBC
 offsets_needed:
+#endif
 	remain_len = end_idx - byte_idx;
 	prev_st = pstr->cur_state;
 	if (BE (pstr->trans != NULL, 0))
@@ -398,7 +400,7 @@ offsets_needed:
 		int mbcdlen;
 
 		wcu = towupper (wc);
-		mbcdlen = wcrtomb (buf, wcu, &prev_st);
+		mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
 		if (BE (mbclen == mbcdlen, 1))
 		  memcpy (pstr->mbs + byte_idx, buf, mbclen);
 		else