Libc-391.tar.gz

[apple/libc.git] / include / wctype.h

diff --git a/include/wctype.h b/include/wctype.h
index eb42efea26cbe4c2c8ec5c1b982c1453eea6bf8a..dabbaff05530286c6f001437ef8f4efe53b34fda 100644 (file)
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -32,71 +32,21 @@
 #define        _WCTYPE_H_
 
 #include <sys/cdefs.h>
 #define        _WCTYPE_H_
 
 #include <sys/cdefs.h>

-#include <sys/types.h>
-
-#include <ctype.h>
-
-#ifndef        _BSD_CT_RUNE_T_DEFINED_
-#define _BSD_CT_RUNE_T_DEFINED_
-typedef        _BSD_CT_RUNE_T_ ct_rune_t;
-#endif
-
-#ifndef        _BSD_RUNE_T_DEFINED_
-#define _BSD_RUNE_T_DEFINED_
-typedef        _BSD_RUNE_T_    rune_t;
-#endif
-
-#ifndef        __cplusplus
-#ifndef        _BSD_WCHAR_T_DEFINED_
-#define        _BSD_WCHAR_T_DEFINED_
-#ifdef __WCHAR_TYPE__
-typedef        __WCHAR_TYPE__  wchar_t;
-#else  /* ! __WCHAR_TYPE__ */
-typedef        _BSD_WCHAR_T_   wchar_t;
-#endif /* __WCHAR_TYPE__ */
-#endif /* _BSD_WCHAR_T_DEFINED_ */
-#endif /* __cplusplus */
-
-#ifndef        _BSD_WINT_T_DEFINED_
-#define _BSD_WINT_T_DEFINED_
-typedef        _BSD_WINT_T_    wint_t;
-#endif
+#include <_types.h>

 
 #ifndef _WCTRANS_T
 
 #ifndef _WCTRANS_T

-typedef        int     wctrans_t;

 #define        _WCTRANS_T
 #define        _WCTRANS_T

+typedef        __darwin_wctrans_t      wctrans_t;

 #endif
 
 #endif
 

-#ifndef _WCTYPE_T
-typedef        unsigned long   wctype_t;
-#define        _WCTYPE_T
-#endif
-
-#ifndef WEOF
-#define        WEOF    ((wint_t)-1)
-#endif
+#include <_wctype.h>
+#include <ctype.h>

 
 __BEGIN_DECLS
 
 __BEGIN_DECLS

-int    iswalnum(wint_t);
-int    iswalpha(wint_t);

 int    iswblank(wint_t);
 int    iswblank(wint_t);

-int    iswcntrl(wint_t);
-int    iswctype(wint_t, wctype_t);
-int    iswdigit(wint_t);
-int    iswgraph(wint_t);
-int    iswlower(wint_t);
-int    iswprint(wint_t);
-int    iswpunct(wint_t);
-int    iswspace(wint_t);
-int    iswupper(wint_t);
-int    iswxdigit(wint_t);

 wint_t towctrans(wint_t, wctrans_t);
 wint_t towctrans(wint_t, wctrans_t);

-wint_t towlower(wint_t);
-wint_t towupper(wint_t);

 wctrans_t
        wctrans(const char *);
 wctrans_t
        wctrans(const char *);

-wctype_t
-       wctype(const char *);

 
 #if !defined(_ANSI_SOURCE)
 wint_t iswascii(wint_t);
 
 #if !defined(_ANSI_SOURCE)
 wint_t iswascii(wint_t);


@@ -107,23 +57,13 @@ wint_t     iswphonogram(wint_t);
 wint_t iswrune(wint_t);
 wint_t iswspecial(wint_t);
 #endif
 wint_t iswrune(wint_t);
 wint_t iswspecial(wint_t);
 #endif

+
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE)
+wint_t nextwctype(wint_t, wctype_t);
+#endif

 __END_DECLS
 
 __END_DECLS
 

-#define        iswalnum(wc)            __istype((wc), _CTYPE_A|_CTYPE_D)
-#define        iswalpha(wc)            __istype((wc), _CTYPE_A)

 #define        iswblank(wc)            __istype((wc), _CTYPE_B)
 #define        iswblank(wc)            __istype((wc), _CTYPE_B)

-#define        iswcntrl(wc)            __istype((wc), _CTYPE_C)
-#define        iswctype(wc, charclass) __istype((wc), (charclass))
-#define        iswdigit(wc)            __istype((wc), _CTYPE_D)
-#define        iswgraph(wc)            __istype((wc), _CTYPE_G)
-#define        iswlower(wc)            __istype((wc), _CTYPE_L)
-#define        iswprint(wc)            __istype((wc), _CTYPE_R)
-#define        iswpunct(wc)            __istype((wc), _CTYPE_P)
-#define        iswspace(wc)            __istype((wc), _CTYPE_S)
-#define        iswupper(wc)            __istype((wc), _CTYPE_U)
-#define        iswxdigit(wc)           __istype((wc), _CTYPE_X)
-#define        towlower(wc)            __tolower(wc)
-#define        towupper(wc)            __toupper(wc)

 
 #if !defined(_ANSI_SOURCE)
 #define        iswascii(wc)            (((wc) & ~0x7F) == 0)
 
 #if !defined(_ANSI_SOURCE)
 #define        iswascii(wc)            (((wc) & ~0x7F) == 0)


@@ -135,4 +75,8 @@ __END_DECLS
 #define        iswspecial(wc)          __istype((wc), _CTYPE_T)
 #endif
 
 #define        iswspecial(wc)          __istype((wc), _CTYPE_T)
 #endif
 

+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_wctype.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+

 #endif         /* _WCTYPE_H_ */
 #endif         /* _WCTYPE_H_ */