INSTALL, install.texi: minor updates, regenerate

[thirdparty/glibc.git] / include / ctype.h

diff --git a/include/ctype.h b/include/ctype.h
index aad0aad5304b4cb1d8e1fbcf17b8a40161ea9f18..493a6f80ce8e8b8edc75578a0d33ba34551a7ace 100644 (file)
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,8 +1,20 @@
 #ifndef _CTYPE_H
 
-extern int __isctype (int __c, int __mask);
+#include <ctype/ctype.h>
 
-# ifndef NOT_IN_libc
+#ifndef _ISOMAC
+/* Initialize ctype locale data.  */
+extern void __ctype_init (void);
+libc_hidden_proto (__ctype_init)
+
+/* ctype/ctype.h defined this as a macro and we don't want to #undef it.
+   So defeat macro expansion with parens for this declaration.  */
+extern int (__isctype) (int __c, int __mask);
+
+libc_hidden_proto (tolower)
+libc_hidden_proto (toupper)
+
+# if IS_IN (libc)
 
 /* These accessors are used by the optimized macros to find the
    thread-local cache of ctype information from the current thread's
@@ -12,45 +24,47 @@ extern int __isctype (int __c, int __mask);
    NL_CURRENT_INDIRECT.  */
 
 #  include "../locale/localeinfo.h"
-#  include <bits/libc-tsd.h>
+#  include <libc-tsd.h>
 
 #  ifndef CTYPE_EXTERN_INLINE  /* Used by ctype/ctype-info.c, which see.  */
 #   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)
 {
-  void **tablep = __libc_tsd_address (CTYPE_B);
-  if (__builtin_expect (*tablep == NULL, 0))
-    *tablep = (uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
-  return (const uint16_t **) tablep;
+  return __libc_tsd_address (const uint16_t *, CTYPE_B);
 }
 
 CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
 __ctype_toupper_loc (void)
 {
-  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 (const int32_t **) tablep;
+  return __libc_tsd_address (const int32_t *, CTYPE_TOUPPER);
 }
 
 CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
 __ctype_tolower_loc (void)
 {
-  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 (const int32_t **) tablep;
+  return __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
 }
 
-# endif        /* Not NOT_IN_libc.  */
+#  ifndef __NO_CTYPE
+/* The spec says that isdigit must only match the decimal digits.  We
+   can check this without a memory access.  */
+#   undef isdigit
+#   define isdigit(c) ({ int __c = (c); __c >= '0' && __c <= '9'; })
+#   undef isdigit_l
+#   define isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; })
+#   undef __isdigit_l
+#   define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; })
+#  endif  /* Not __NO_CTYPE.  */
 
-# include <ctype/ctype.h>
+# endif        /* IS_IN (libc).  */
+#endif  /* Not _ISOMAC.  */
 
 #endif /* ctype.h */