Jacek Caban : include: Add new corecrt_wctype file.
Alexandre Julliard
julliard at winehq.org
Fri Feb 21 15:27:06 CST 2020
Module: wine
Branch: master
Commit: 0f932c9d457cc3f077b1fd27a9b4c924e528b38b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f932c9d457cc3f077b1fd27a9b4c924e528b38b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Feb 21 17:18:22 2020 +0100
include: Add new corecrt_wctype file.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/Makefile.in | 1 +
include/msvcrt/corecrt_wctype.h | 49 +++++++++++++++++++++++++++++++++++++++++
include/msvcrt/ctype.h | 35 +----------------------------
include/msvcrt/wchar.h | 38 +-------------------------------
4 files changed, 52 insertions(+), 71 deletions(-)
diff --git a/include/Makefile.in b/include/Makefile.in
index fbfbf72be0..694828ab71 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -425,6 +425,7 @@ SOURCES = \
msvcrt/conio.h \
msvcrt/corecrt.h \
msvcrt/corecrt_stdio_config.h \
+ msvcrt/corecrt_wctype.h \
msvcrt/corecrt_wio.h \
msvcrt/corecrt_wstdio.h \
msvcrt/corecrt_wtime.h \
diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h
new file mode 100644
index 0000000000..d090538fae
--- /dev/null
+++ b/include/msvcrt/corecrt_wctype.h
@@ -0,0 +1,49 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the Wine project.
+ */
+
+#ifndef _WCTYPE_DEFINED
+#define _WCTYPE_DEFINED
+
+#include <corecrt.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ASCII char classification table - binary compatible */
+#define _UPPER 0x0001 /* C1_UPPER */
+#define _LOWER 0x0002 /* C1_LOWER */
+#define _DIGIT 0x0004 /* C1_DIGIT */
+#define _SPACE 0x0008 /* C1_SPACE */
+#define _PUNCT 0x0010 /* C1_PUNCT */
+#define _CONTROL 0x0020 /* C1_CNTRL */
+#define _BLANK 0x0040 /* C1_BLANK */
+#define _HEX 0x0080 /* C1_XDIGIT */
+#define _LEADBYTE 0x8000
+#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */
+
+int __cdecl is_wctype(wint_t,wctype_t);
+int __cdecl isleadbyte(int);
+int __cdecl iswalnum(wint_t);
+int __cdecl iswalpha(wint_t);
+int __cdecl iswascii(wint_t);
+int __cdecl iswcntrl(wint_t);
+int __cdecl iswctype(wint_t,wctype_t);
+int __cdecl iswdigit(wint_t);
+int __cdecl iswgraph(wint_t);
+int __cdecl iswlower(wint_t);
+int __cdecl iswprint(wint_t);
+int __cdecl iswpunct(wint_t);
+int __cdecl iswspace(wint_t);
+int __cdecl iswupper(wint_t);
+int __cdecl iswxdigit(wint_t);
+wchar_t __cdecl towlower(wchar_t);
+wchar_t __cdecl towupper(wchar_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WCTYPE_DEFINED */
diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h
index 85b85ddeb4..00e77c959b 100644
--- a/include/msvcrt/ctype.h
+++ b/include/msvcrt/ctype.h
@@ -8,7 +8,7 @@
#ifndef __WINE_CTYPE_H
#define __WINE_CTYPE_H
-#include <corecrt.h>
+#include <corecrt_wctype.h>
#ifdef __cplusplus
extern "C" {
@@ -18,18 +18,6 @@ extern "C" {
#define WEOF (wint_t)(0xFFFF)
#endif
-/* ASCII char classification table - binary compatible */
-#define _UPPER 0x0001 /* C1_UPPER */
-#define _LOWER 0x0002 /* C1_LOWER */
-#define _DIGIT 0x0004 /* C1_DIGIT */
-#define _SPACE 0x0008 /* C1_SPACE */
-#define _PUNCT 0x0010 /* C1_PUNCT */
-#define _CONTROL 0x0020 /* C1_CNTRL */
-#define _BLANK 0x0040 /* C1_BLANK */
-#define _HEX 0x0080 /* C1_XDIGIT */
-#define _LEADBYTE 0x8000
-#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */
-
int __cdecl __isascii(int);
int __cdecl __iscsym(int);
int __cdecl __iscsymf(int);
@@ -51,27 +39,6 @@ int __cdecl isxdigit(int);
int __cdecl tolower(int);
int __cdecl toupper(int);
-#ifndef _WCTYPE_DEFINED
-#define _WCTYPE_DEFINED
-int __cdecl is_wctype(wint_t,wctype_t);
-int __cdecl isleadbyte(int);
-int __cdecl iswalnum(wint_t);
-int __cdecl iswalpha(wint_t);
-int __cdecl iswascii(wint_t);
-int __cdecl iswcntrl(wint_t);
-int __cdecl iswctype(wint_t,wctype_t);
-int __cdecl iswdigit(wint_t);
-int __cdecl iswgraph(wint_t);
-int __cdecl iswlower(wint_t);
-int __cdecl iswprint(wint_t);
-int __cdecl iswpunct(wint_t);
-int __cdecl iswspace(wint_t);
-int __cdecl iswupper(wint_t);
-int __cdecl iswxdigit(wint_t);
-wchar_t __cdecl towlower(wchar_t);
-wchar_t __cdecl towupper(wchar_t);
-#endif /* _WCTYPE_DEFINED */
-
#ifdef __cplusplus
}
#endif
diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h
index 0b7be92174..ade970b6f3 100644
--- a/include/msvcrt/wchar.h
+++ b/include/msvcrt/wchar.h
@@ -9,13 +9,12 @@
#define __WINE_WCHAR_H
#include <corecrt_wstdio.h>
+#include <corecrt_wctype.h>
#include <corecrt_wio.h>
#include <corecrt_wtime.h>
#include <string.h>
#include <sys/stat.h>
-#include <pshpack8.h>
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -27,39 +26,6 @@ extern "C" {
typedef int mbstate_t;
-/* ASCII char classification table - binary compatible */
-#define _UPPER 0x0001 /* C1_UPPER */
-#define _LOWER 0x0002 /* C1_LOWER */
-#define _DIGIT 0x0004 /* C1_DIGIT */
-#define _SPACE 0x0008 /* C1_SPACE */
-#define _PUNCT 0x0010 /* C1_PUNCT */
-#define _CONTROL 0x0020 /* C1_CNTRL */
-#define _BLANK 0x0040 /* C1_BLANK */
-#define _HEX 0x0080 /* C1_XDIGIT */
-#define _LEADBYTE 0x8000
-#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */
-
-#ifndef _WCTYPE_DEFINED
-#define _WCTYPE_DEFINED
-int __cdecl is_wctype(wint_t,wctype_t);
-int __cdecl isleadbyte(int);
-int __cdecl iswalnum(wint_t);
-int __cdecl iswalpha(wint_t);
-int __cdecl iswascii(wint_t);
-int __cdecl iswcntrl(wint_t);
-int __cdecl iswctype(wint_t,wctype_t);
-int __cdecl iswdigit(wint_t);
-int __cdecl iswgraph(wint_t);
-int __cdecl iswlower(wint_t);
-int __cdecl iswprint(wint_t);
-int __cdecl iswpunct(wint_t);
-int __cdecl iswspace(wint_t);
-int __cdecl iswupper(wint_t);
-int __cdecl iswxdigit(wint_t);
-wchar_t __cdecl towlower(wchar_t);
-wchar_t __cdecl towupper(wchar_t);
-#endif /* _WCTYPE_DEFINED */
-
#ifndef _WDIRECT_DEFINED
#define _WDIRECT_DEFINED
int __cdecl _wchdir(const wchar_t*);
@@ -228,6 +194,4 @@ static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n)
}
#endif
-#include <poppack.h>
-
#endif /* __WINE_WCHAR_H */
More information about the wine-cvs
mailing list