Libc-1044.1.2.tar.gz

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

diff --git a/include/wchar.h b/include/wchar.h
index fe527fd388174be14d4e1bba5bf466cdbc80f5a5..bd16be11f00ae17c64e3598abd654ef3130f641d 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -71,36 +71,12 @@
 #include <sys/cdefs.h>
 #include <Availability.h>
 
-#ifndef NULL
-#define        NULL    __DARWIN_NULL
-#endif /* ! NULL */
-
-#ifndef        _SIZE_T
-#define        _SIZE_T
-typedef        __darwin_size_t         size_t;
-#endif
-
-#ifndef        _MBSTATE_T
-#define        _MBSTATE_T
-typedef        __darwin_mbstate_t      mbstate_t;
-#endif
-
-#ifndef        _CT_RUNE_T
-#define _CT_RUNE_T
-typedef        __darwin_ct_rune_t      ct_rune_t;
-#endif
-
-#ifndef        _RUNE_T
-#define _RUNE_T
-typedef        __darwin_rune_t         rune_t;
-#endif
-
-#ifndef        __cplusplus
-#ifndef        _WCHAR_T
-#define        _WCHAR_T
-typedef        __darwin_wchar_t        wchar_t;
-#endif /* _WCHAR_T */
-#endif /* __cplusplus */
+#include <sys/_types/_null.h>
+#include <sys/_types/_size_t.h>
+#include <sys/_types/_mbstate_t.h>
+#include <sys/_types/_ct_rune_t.h>
+#include <sys/_types/_rune_t.h>
+#include <sys/_types/_wchar_t.h>
 
 #ifndef WCHAR_MIN
 #define WCHAR_MIN      __DARWIN_WCHAR_MIN
@@ -124,8 +100,8 @@ wchar_t     *fgetws(wchar_t * __restrict, int, FILE * __restrict);
 wint_t fputwc(wchar_t, FILE *);
 int    fputws(const wchar_t * __restrict, FILE * __restrict);
 int    fwide(FILE *, int);
-int    fwprintf(FILE * __restrict, const wchar_t * __restrict, ...) __DARWIN_LDBL_COMPAT(fwprintf);
-int    fwscanf(FILE * __restrict, const wchar_t * __restrict, ...) __DARWIN_LDBL_COMPAT(fwscanf);
+int    fwprintf(FILE * __restrict, const wchar_t * __restrict, ...);
+int    fwscanf(FILE * __restrict, const wchar_t * __restrict, ...);
 wint_t getwc(FILE *);
 wint_t getwchar(void);
 size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
@@ -136,15 +112,14 @@ size_t    mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
            mbstate_t * __restrict);
 wint_t putwc(wchar_t, FILE *);
 wint_t putwchar(wchar_t);
-int    swprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict,
-           ...) __DARWIN_LDBL_COMPAT(swprintf);
-int    swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...) __DARWIN_LDBL_COMPAT(swscanf);
+int    swprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict, ...);
+int    swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...);
 wint_t ungetwc(wint_t, FILE *);
 int    vfwprintf(FILE * __restrict, const wchar_t * __restrict,
-           __darwin_va_list) __DARWIN_LDBL_COMPAT(vfwprintf);
+           __darwin_va_list);
 int    vswprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict,
-           __darwin_va_list) __DARWIN_LDBL_COMPAT(vswprintf);
-int    vwprintf(const wchar_t * __restrict, __darwin_va_list) __DARWIN_LDBL_COMPAT(vwprintf);
+           __darwin_va_list);
+int    vwprintf(const wchar_t * __restrict, __darwin_va_list);
 size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
 wchar_t        *wcscat(wchar_t * __restrict, const wchar_t * __restrict);
 wchar_t        *wcschr(const wchar_t *, wchar_t);
@@ -186,8 +161,8 @@ int wmemcmp(const wchar_t *, const wchar_t *, size_t);
 wchar_t        *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
 wchar_t        *wmemmove(wchar_t *, const wchar_t *, size_t);
 wchar_t        *wmemset(wchar_t *, wchar_t, size_t);
-int    wprintf(const wchar_t * __restrict, ...) __DARWIN_LDBL_COMPAT(wprintf);
-int    wscanf(const wchar_t * __restrict, ...) __DARWIN_LDBL_COMPAT(wscanf);
+int    wprintf(const wchar_t * __restrict, ...);
+int    wscanf(const wchar_t * __restrict, ...);
 int    wcswidth(const wchar_t *, size_t);
 int    wcwidth(wchar_t);
 __END_DECLS
@@ -202,13 +177,13 @@ __END_DECLS
 #if __DARWIN_C_LEVEL >= 200112L || defined(_C99_SOURCE) || defined(__cplusplus)
 __BEGIN_DECLS
 int    vfwscanf(FILE * __restrict, const wchar_t * __restrict,
-           __darwin_va_list) __DARWIN_LDBL_COMPAT(vfwscanf);
+           __darwin_va_list);
 int    vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
-           __darwin_va_list) __DARWIN_LDBL_COMPAT(vswscanf);
-int    vwscanf(const wchar_t * __restrict, __darwin_va_list) __DARWIN_LDBL_COMPAT(vwscanf);
+           __darwin_va_list);
+int    vwscanf(const wchar_t * __restrict, __darwin_va_list);
 float  wcstof(const wchar_t * __restrict, wchar_t ** __restrict);
 long double
-       wcstold(const wchar_t * __restrict, wchar_t ** __restrict) __DARWIN_LDBL_COMPAT(wcstold);
+       wcstold(const wchar_t * __restrict, wchar_t ** __restrict);
 #if !__DARWIN_NO_LONG_LONG
 long long
        wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int);