qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* wcsmbs/wchar.h (btowc, wctob): Don't optimize in C++.

This commit is contained in:
Ulrich Drepper 2006-03-27 20:14:15 +00:00
parent c8e82b4a29
commit 5b20043897
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-03-27 Jakub Jelinek <jakub@redhat.com>
* wcsmbs/wchar.h (btowc, wctob): Don't optimize in C++.
2006-03-24 David S. Miller <davem@sunset.davemloft.net> 2006-03-24 David S. Miller <davem@sunset.davemloft.net>
* sysdeps/sparc/sparc32/bits/atomic.h * sysdeps/sparc/sparc32/bits/atomic.h

2
wcsmbs/wchar.h
View File

@ -321,6 +321,7 @@ __END_NAMESPACE_C99
#ifdef __USE_EXTERN_INLINES #ifdef __USE_EXTERN_INLINES
/* Define inline function as optimization. */ /* Define inline function as optimization. */
# ifndef __cplusplus
/* We can use the BTOWC and WCTOB optimizations since we know that all /* We can use the BTOWC and WCTOB optimizations since we know that all
locales must use ASCII encoding for the values in the ASCII range locales must use ASCII encoding for the values in the ASCII range
and because the wchar_t encoding is always ISO 10646. */ and because the wchar_t encoding is always ISO 10646. */
@ -335,6 +336,7 @@ extern __inline int
__NTH (wctob (wint_t __wc)) __NTH (wctob (wint_t __wc))
{ return (__builtin_constant_p (__wc) && __wc >= L'\0' && __wc <= L'\x7f' { return (__builtin_constant_p (__wc) && __wc >= L'\0' && __wc <= L'\x7f'
? (int) __wc : __wctob_alias (__wc)); } ? (int) __wc : __wctob_alias (__wc)); }
# endif
extern __inline size_t extern __inline size_t
__NTH (mbrlen (__const char *__restrict __s, size_t __n, __NTH (mbrlen (__const char *__restrict __s, size_t __n,