diff options
| author | Roland McGrath <roland@gnu.org> | 2003-03-16 01:04:03 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-03-16 01:04:03 +0000 |
| commit | 638bb1f3941f1714659150a2202627d3820d6b05 (patch) | |
| tree | a101f92e76c6b8f0f94606a23480a4712850eb4a /include/ctype.h | |
| parent | e993ec9a5b59d64e7037182376f3928af752ccf3 (diff) | |
* nscd/cache.c (cache_search): Give first arg type `request_type'.
* nscd/nscd.h: Update decl.
* nscd/nscd_getpw_r.c (nscd_getpw_r): Add casts for signedness.
* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
* elf/dl-close.c (_dl_close): Likewise.
* sysdeps/unix/sysv/linux/powerpc/chown.c (__chown): int -> size_t
* io/fts.c (fts_build): Likewise.
* elf/cache.c (add_to_cache): Likewise.
* locale/programs/locarchive.c (show_archive_content): Likewise.
* posix/fnmatch.c (fnmatch): Tweak __builtin_expect use.
* include/ctype.h (__ctype_b_loc): Tweak type punning to make gcc 3.3
happy.
(__ctype_toupper_loc, __ctype_tolower_loc): Likewise.
Diffstat (limited to 'include/ctype.h')
| -rw-r--r-- | include/ctype.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/ctype.h b/include/ctype.h index ca3c3dd856..aad0aad530 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -25,31 +25,28 @@ __libc_tsd_define (extern, CTYPE_TOLOWER) CTYPE_EXTERN_INLINE const uint16_t ** __attribute__ ((const)) __ctype_b_loc (void) { - const uint16_t **tablep = - (const uint16_t **) __libc_tsd_address (CTYPE_B); + void **tablep = __libc_tsd_address (CTYPE_B); if (__builtin_expect (*tablep == NULL, 0)) - *tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128; - return tablep; + *tablep = (uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128; + return (const uint16_t **) tablep; } CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const)) __ctype_toupper_loc (void) { - const int32_t **tablep = - (const int32_t **) __libc_tsd_address (CTYPE_TOUPPER); + void **tablep = __libc_tsd_address (CTYPE_TOUPPER); if (__builtin_expect (*tablep == NULL, 0)) *tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128); - return tablep; + return (const int32_t **) tablep; } CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const)) __ctype_tolower_loc (void) { - const int32_t **tablep = - (const int32_t **) __libc_tsd_address (CTYPE_TOLOWER); + void **tablep = __libc_tsd_address (CTYPE_TOLOWER); if (__builtin_expect (*tablep == NULL, 0)) *tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128); - return tablep; + return (const int32_t **) tablep; } # endif /* Not NOT_IN_libc. */ |