Loading...
--- Libc/Libc-320/include/ctype.h
+++ Libc/Libc-1583.60.2/include/ctype.h
@@ -1,9 +1,7 @@
/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2005, 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
@@ -68,172 +66,10 @@
#ifndef _CTYPE_H_
#define _CTYPE_H_
-#include <runetype.h>
+#include <_ctype.h>
-#define _CTYPE_A 0x00000100L /* Alpha */
-#define _CTYPE_C 0x00000200L /* Control */
-#define _CTYPE_D 0x00000400L /* Digit */
-#define _CTYPE_G 0x00000800L /* Graph */
-#define _CTYPE_L 0x00001000L /* Lower */
-#define _CTYPE_P 0x00002000L /* Punct */
-#define _CTYPE_S 0x00004000L /* Space */
-#define _CTYPE_U 0x00008000L /* Upper */
-#define _CTYPE_X 0x00010000L /* X digit */
-#define _CTYPE_B 0x00020000L /* Blank */
-#define _CTYPE_R 0x00040000L /* Print */
-#define _CTYPE_I 0x00080000L /* Ideogram */
-#define _CTYPE_T 0x00100000L /* Special */
-#define _CTYPE_Q 0x00200000L /* Phonogram */
-#define _CTYPE_SW0 0x20000000L /* 0 width character */
-#define _CTYPE_SW1 0x40000000L /* 1 width character */
-#define _CTYPE_SW2 0x80000000L /* 2 width character */
-#define _CTYPE_SW3 0xc0000000L /* 3 width character */
-
-/*
- * Backward compatibility
- */
-#define _A _CTYPE_A /* Alpha */
-#define _C _CTYPE_C /* Control */
-#define _D _CTYPE_D /* Digit */
-#define _G _CTYPE_G /* Graph */
-#define _L _CTYPE_L /* Lower */
-#define _P _CTYPE_P /* Punct */
-#define _S _CTYPE_S /* Space */
-#define _U _CTYPE_U /* Upper */
-#define _X _CTYPE_X /* X digit */
-#define _B _CTYPE_B /* Blank */
-#define _R _CTYPE_R /* Print */
-#define _I _CTYPE_I /* Ideogram */
-#define _T _CTYPE_T /* Special */
-#define _Q _CTYPE_Q /* Phonogram */
-#define _SW0 _CTYPE_SW0 /* 0 width character */
-#define _SW1 _CTYPE_SW1 /* 1 width character */
-#define _SW2 _CTYPE_SW2 /* 2 width character */
-#define _SW3 _CTYPE_SW3 /* 3 width character */
-
-__BEGIN_DECLS
-int isalnum(int);
-int isalpha(int);
-int iscntrl(int);
-int isdigit(int);
-int isgraph(int);
-int islower(int);
-int isprint(int);
-int ispunct(int);
-int isspace(int);
-int isupper(int);
-int isxdigit(int);
-int tolower(int);
-int toupper(int);
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int digittoint(int);
-int isascii(int);
-int isblank(int);
-int ishexnumber(int);
-int isideogram(int);
-int isnumber(int);
-int isphonogram(int);
-int isrune(int);
-int isspecial(int);
-int toascii(int);
-#endif
-__END_DECLS
-
-
-#define isalnum(c) __istype((c), (_CTYPE_A|_CTYPE_D))
-#define isalpha(c) __istype((c), _CTYPE_A)
-#define iscntrl(c) __istype((c), _CTYPE_C)
-#define isdigit(c) __isctype((c), _CTYPE_D) /* ANSI -- locale independent */
-#define isgraph(c) __istype((c), _CTYPE_G)
-#define islower(c) __istype((c), _CTYPE_L)
-#define isprint(c) __istype((c), _CTYPE_R)
-#define ispunct(c) __istype((c), _CTYPE_P)
-#define isspace(c) __istype((c), _CTYPE_S)
-#define isupper(c) __istype((c), _CTYPE_U)
-#define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */
-#define tolower(c) __tolower(c)
-#define toupper(c) __toupper(c)
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-#define digittoint(c) __maskrune((c), 0xFF)
-#define isascii(c) ((c & ~0x7F) == 0)
-#define isblank(c) __istype((c), _CTYPE_B)
-#define ishexnumber(c) __istype((c), _CTYPE_X)
-#define isideogram(c) __istype((c), _CTYPE_I)
-#define isnumber(c) __istype((c), _CTYPE_D)
-#define isphonogram(c) __istype((c), _CTYPE_Q)
-#define isrune(c) __istype((c), 0xFFFFFF00L)
-#define isspecial(c) __istype((c), _CTYPE_T)
-#define toascii(c) ((c) & 0x7F)
-#endif
-
-/* See comments in <machine/ansi.h> about _BSD_RUNE_T_. */
-__BEGIN_DECLS
-unsigned long ___runetype(_BSD_CT_RUNE_T_);
-_BSD_CT_RUNE_T_ ___tolower(_BSD_CT_RUNE_T_);
-_BSD_CT_RUNE_T_ ___toupper(_BSD_CT_RUNE_T_);
-__END_DECLS
-
-/*
- * _EXTERNALIZE_CTYPE_INLINES_ is defined in locale/nomacros.c to tell us
- * to generate code for extern versions of all our inline functions.
- */
-#ifdef _EXTERNALIZE_CTYPE_INLINES_
-#define _USE_CTYPE_INLINE_
-#define static
-#define __inline
-#endif
-
-/*
- * Use inline functions if we are allowed to and the compiler supports them.
- */
-#if !defined(_DONT_USE_CTYPE_INLINE_) && \
- (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
-
-static __inline int
-__maskrune(_BSD_CT_RUNE_T_ _c, unsigned long _f)
-{
- return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
- _CurrentRuneLocale->runetype[_c]) & _f;
-}
-
-static __inline int
-__istype(_BSD_CT_RUNE_T_ c, unsigned long f)
-{
- return !!(__maskrune(c, f));
-}
-
-static __inline _BSD_CT_RUNE_T_
-__isctype(_BSD_CT_RUNE_T_ _c, unsigned long _f)
-{
- return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
- !!(_DefaultRuneLocale.runetype[_c] & _f);
-}
-
-static __inline _BSD_CT_RUNE_T_
-__toupper(_BSD_CT_RUNE_T_ _c)
-{
- return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
- _CurrentRuneLocale->mapupper[_c];
-}
-
-static __inline _BSD_CT_RUNE_T_
-__tolower(_BSD_CT_RUNE_T_ _c)
-{
- return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
- _CurrentRuneLocale->maplower[_c];
-}
-
-#else /* not using inlines */
-
-__BEGIN_DECLS
-int __maskrune(_BSD_CT_RUNE_T_, unsigned long);
-int __istype (_BSD_CT_RUNE_T_, unsigned long);
-int __isctype(_BSD_CT_RUNE_T_, unsigned long);
-_BSD_CT_RUNE_T_ __toupper(_BSD_CT_RUNE_T_);
-_BSD_CT_RUNE_T_ __tolower(_BSD_CT_RUNE_T_);
-__END_DECLS
-#endif /* using inlines */
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_ctype.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
#endif /* !_CTYPE_H_ */