msvcrt: compatibility fixes
Dimitrie O. Paun
dpaun at rogers.com
Sat Apr 24 01:49:31 CDT 2004
ChangeLog
Fix the _WCHAR_T_DEFINED/_WCHAR_T_DEFINED sentries for
compatibility with the MSVCRT ones.
Make wint_t/wctype_t type compatible with the MS ones.
Index: include/msvcrt/ctype.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/ctype.h,v
retrieving revision 1.5
diff -u -r1.5 ctype.h
--- include/msvcrt/ctype.h 18 Jul 2003 22:57:15 -0000 1.5
+++ include/msvcrt/ctype.h 23 Apr 2004 20:48:48 -0000
@@ -23,8 +23,8 @@
extern "C" {
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
@@ -40,10 +40,10 @@
# endif
#endif /* USE_MSVCRT_PREFIX */
-#ifndef MSVCRT_WCTYPE_T_DEFINED
-typedef MSVCRT(wchar_t) MSVCRT(wint_t);
-typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
-#define MSVCRT_WCTYPE_T_DEFINED
+#ifndef _WCTYPE_T_DEFINED
+typedef unsigned short MSVCRT(wint_t);
+typedef unsigned short MSVCRT(wctype_t);
+#define _WCTYPE_T_DEFINED
#endif
/* ASCII char classification table - binary compatible */
Index: include/msvcrt/direct.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/direct.h,v
retrieving revision 1.6
diff -u -r1.6 direct.h
--- include/msvcrt/direct.h 16 Mar 2004 19:17:11 -0000 1.6
+++ include/msvcrt/direct.h 23 Apr 2004 20:48:48 -0000
@@ -23,8 +23,8 @@
extern "C" {
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/io.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/io.h,v
retrieving revision 1.7
diff -u -r1.7 io.h
--- include/msvcrt/io.h 16 Mar 2004 19:17:11 -0000 1.7
+++ include/msvcrt/io.h 23 Apr 2004 20:48:48 -0000
@@ -19,8 +19,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/locale.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/locale.h,v
retrieving revision 1.5
diff -u -r1.5 locale.h
--- include/msvcrt/locale.h 18 Jul 2003 22:57:15 -0000 1.5
+++ include/msvcrt/locale.h 23 Apr 2004 20:48:48 -0000
@@ -31,8 +31,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/process.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/process.h,v
retrieving revision 1.10
diff -u -r1.10 process.h
--- include/msvcrt/process.h 18 Jul 2003 22:57:15 -0000 1.10
+++ include/msvcrt/process.h 23 Apr 2004 20:48:48 -0000
@@ -19,8 +19,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/stddef.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/stddef.h,v
retrieving revision 1.7
diff -u -r1.7 stddef.h
--- include/msvcrt/stddef.h 18 Jul 2003 22:57:15 -0000 1.7
+++ include/msvcrt/stddef.h 23 Apr 2004 20:48:48 -0000
@@ -31,8 +31,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/stdio.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/stdio.h,v
retrieving revision 1.17
diff -u -r1.17 stdio.h
--- include/msvcrt/stdio.h 16 Mar 2004 19:17:11 -0000 1.17
+++ include/msvcrt/stdio.h 23 Apr 2004 20:48:48 -0000
@@ -122,17 +122,17 @@
#define MSVCRT_SIZE_T_DEFINED
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
#endif
-#ifndef MSVCRT_WCTYPE_T_DEFINED
-typedef MSVCRT(wchar_t) MSVCRT(wint_t);
-typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
-#define MSVCRT_WCTYPE_T_DEFINED
+#ifndef _WCTYPE_T_DEFINED
+typedef unsigned short MSVCRT(wint_t);
+typedef unsigned short MSVCRT(wctype_t);
+#define _WCTYPE_T_DEFINED
#endif
#ifdef __cplusplus
Index: include/msvcrt/stdlib.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/stdlib.h,v
retrieving revision 1.16
diff -u -r1.16 stdlib.h
--- include/msvcrt/stdlib.h 16 Mar 2004 19:17:11 -0000 1.16
+++ include/msvcrt/stdlib.h 23 Apr 2004 20:48:48 -0000
@@ -27,8 +27,8 @@
#endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/string.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/string.h,v
retrieving revision 1.9
diff -u -r1.9 string.h
--- include/msvcrt/string.h 16 Mar 2004 19:17:11 -0000 1.9
+++ include/msvcrt/string.h 23 Apr 2004 20:48:49 -0000
@@ -19,8 +19,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/time.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/time.h,v
retrieving revision 1.7
diff -u -r1.7 time.h
--- include/msvcrt/time.h 16 Mar 2004 19:17:11 -0000 1.7
+++ include/msvcrt/time.h 23 Apr 2004 20:48:49 -0000
@@ -31,8 +31,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/wchar.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/wchar.h,v
retrieving revision 1.7
diff -u -r1.7 wchar.h
--- include/msvcrt/wchar.h 25 Mar 2004 00:10:06 -0000 1.7
+++ include/msvcrt/wchar.h 23 Apr 2004 20:48:49 -0000
@@ -25,8 +25,8 @@
extern "C" {
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
@@ -50,10 +50,10 @@
#define MSVCRT_SIZE_T_DEFINED
#endif
-#ifndef MSVCRT_WCTYPE_T_DEFINED
-typedef MSVCRT(wchar_t) MSVCRT(wint_t);
-typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
-#define MSVCRT_WCTYPE_T_DEFINED
+#ifndef _WCTYPE_T_DEFINED
+typedef unsigned short MSVCRT(wint_t);
+typedef unsigned short MSVCRT(wctype_t);
+#define _WCTYPE_T_DEFINED
#endif
#ifndef _MSC_VER
Index: include/msvcrt/wctype.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/wctype.h,v
retrieving revision 1.6
diff -u -r1.6 wctype.h
--- include/msvcrt/wctype.h 18 Jul 2003 22:57:15 -0000 1.6
+++ include/msvcrt/wctype.h 23 Apr 2004 20:48:49 -0000
@@ -31,8 +31,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
@@ -60,10 +60,10 @@
# endif
#endif /* USE_MSVCRT_PREFIX */
-#ifndef MSVCRT_WCTYPE_T_DEFINED
-typedef MSVCRT(wchar_t) MSVCRT(wint_t);
-typedef MSVCRT(wchar_t) MSVCRT(wctype_t);
-#define MSVCRT_WCTYPE_T_DEFINED
+#ifndef _WCTYPE_T_DEFINED
+typedef unsigned short MSVCRT(wint_t);
+typedef unsigned short MSVCRT(wctype_t);
+#define _WCTYPE_T_DEFINED
#endif
/* FIXME: there's something to do with __p__pctype and __p__pwctype */
Index: include/msvcrt/sys/stat.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/sys/stat.h,v
retrieving revision 1.12
diff -u -r1.12 stat.h
--- include/msvcrt/sys/stat.h 16 Mar 2004 19:17:11 -0000 1.12
+++ include/msvcrt/sys/stat.h 23 Apr 2004 20:48:49 -0000
@@ -21,8 +21,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
Index: include/msvcrt/sys/utime.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/sys/utime.h,v
retrieving revision 1.6
diff -u -r1.6 utime.h
--- include/msvcrt/sys/utime.h 18 Jul 2003 22:57:15 -0000 1.6
+++ include/msvcrt/sys/utime.h 23 Apr 2004 20:48:49 -0000
@@ -31,8 +31,8 @@
# endif
#endif
-#ifndef MSVCRT_WCHAR_T_DEFINED
-#define MSVCRT_WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short MSVCRT(wchar_t);
#endif
--
Dimi.
More information about the wine-patches
mailing list