summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-11-12 20:29:35 +0000
committerJakub Jelinek <jakub@redhat.com>2008-11-12 20:29:35 +0000
commit03c8e287448a12c8c4c6db3570f5b7e3930d488d (patch)
tree6227d4a8b3362cade23f1a5bdf6065c4e4a415ec /include
parentc02fa54041a68c12107ec577770ff81329af3bef (diff)
Updated to fedora-glibc-20081112T2008cvs/fedora-glibc-2_8_90-17
Diffstat (limited to 'include')
-rw-r--r--include/ctype.h45
-rw-r--r--include/rpc/rpc.h2
-rw-r--r--include/stdio.h11
3 files changed, 16 insertions, 42 deletions
diff --git a/include/ctype.h b/include/ctype.h
index ae38b1bf23..f4b782e136 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -18,50 +18,35 @@ extern int __isctype (int __c, int __mask);
# define CTYPE_EXTERN_INLINE extern inline
# endif
-__libc_tsd_define (extern, CTYPE_B)
-__libc_tsd_define (extern, CTYPE_TOUPPER)
-__libc_tsd_define (extern, CTYPE_TOLOWER)
+__libc_tsd_define (extern, const uint16_t *, CTYPE_B)
+__libc_tsd_define (extern, const int32_t *, CTYPE_TOUPPER)
+__libc_tsd_define (extern, const int32_t *, CTYPE_TOLOWER)
CTYPE_EXTERN_INLINE const uint16_t ** __attribute__ ((const))
__ctype_b_loc (void)
{
- union
- {
- void **ptr;
- const uint16_t **tablep;
- } u;
- u.ptr = __libc_tsd_address (CTYPE_B);
- if (__builtin_expect (*u.tablep == NULL, 0))
- *u.tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
- return u.tablep;
+ const uint16_t **tablep = __libc_tsd_address (const uint16_t *, CTYPE_B);
+ if (__builtin_expect (*tablep == NULL, 0))
+ *tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
+ return tablep;
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_toupper_loc (void)
{
- union
- {
- void **ptr;
- const int32_t **tablep;
- } u;
- u.ptr = __libc_tsd_address (CTYPE_TOUPPER);
- if (__builtin_expect (*u.tablep == NULL, 0))
- *u.tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
- return u.tablep;
+ const int32_t **tablep = __libc_tsd_address (const int32_t *, CTYPE_TOUPPER);
+ if (__builtin_expect (*tablep == NULL, 0))
+ *tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
+ return tablep;
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_tolower_loc (void)
{
- union
- {
- void **ptr;
- const int32_t **tablep;
- } u;
- u.ptr = __libc_tsd_address (CTYPE_TOLOWER);
- if (__builtin_expect (*u.tablep == NULL, 0))
- *u.tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
- return u.tablep;
+ const int32_t **tablep = __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
+ if (__builtin_expect (*tablep == NULL, 0))
+ *tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
+ return tablep;
}
# endif /* Not NOT_IN_libc. */
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index e5b1685f54..d2f3013114 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -45,7 +45,7 @@ extern void __rpc_thread_key_cleanup (void);
extern void __rpc_thread_destroy (void);
-__libc_tsd_define (extern, RPC_VARS)
+__libc_tsd_define (extern, struct rpc_thread_variables *, RPC_VARS)
#define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x)
diff --git a/include/stdio.h b/include/stdio.h
index 54f2507261..d82728a845 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -160,17 +160,6 @@ libc_hidden_proto (__vfprintf_chk)
libc_hidden_proto (__vasprintf_chk)
libc_hidden_proto (__vdprintf_chk)
libc_hidden_proto (__obstack_vprintf_chk)
-
-# if !defined NOT_IN_libc && defined SHARED && defined DO_VERSIONING \
- && !defined NO_HIDDEN
-/* Special gcc builtins. */
-extern size_t __builtin_fwrite (const void *, size_t, size_t, void *)
- __asm ("__GI_fwrite");
-extern size_t __builtin_fwrite_unlocked (const void *, size_t, size_t, void *)
- __asm ("__GI_fwrite_unlocked");
-
-# endif
-
# endif
#endif