diff options
Diffstat (limited to 'devel/w32api/patches/patch-ah')
| -rw-r--r-- | devel/w32api/patches/patch-ah | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/devel/w32api/patches/patch-ah b/devel/w32api/patches/patch-ah index 56035fc54de..58b73b73d45 100644 --- a/devel/w32api/patches/patch-ah +++ b/devel/w32api/patches/patch-ah @@ -1,33 +1,23 @@ -$NetBSD: patch-ah,v 1.2 2002/03/18 03:25:47 kent Exp $ +$NetBSD: patch-ah,v 1.3 2003/04/10 15:25:46 kent Exp $ ---- include/winnt.h.orig Tue Dec 4 22:10:28 2001 +--- include/winnt.h~ 2002-06-14 20:42:27.000000000 +0900 +++ include/winnt.h -@@ -52,15 +52,19 @@ +@@ -55,6 +55,10 @@ typedef unsigned short USHORT,*PUSHORT; + typedef unsigned long ULONG,*PULONG; typedef char *PSZ; ++#ifdef __NetBSDPE__ ++#include <stdint.h> ++typedef uint16_t WCHAR; ++#else #ifndef _WCHAR_T_DEFINED --#define _WCHAR_T_DEFINED --#ifndef _WCHAR_T_ --#define _WCHAR_T_ --#undef __need_wchar_t --#ifndef __cplusplus --typedef unsigned short wchar_t; --#endif --#endif --#endif -+# define _WCHAR_T_DEFINED -+# ifndef _WCHAR_T_ -+# define _WCHAR_T_ -+# undef __need_wchar_t -+# ifndef __cplusplus -+# include <machine/ansi.h> -+# ifdef _BSD_WCHAR_T_ -+typedef _BSD_WCHAR_T_ wchar_t; -+# undef _BSD_WCHAR_T_ -+# endif /* _BSD_WCHAR_T_ */ -+# endif /* !__cplusplus */ -+# endif /* !_WCHAR_T_ */ -+#endif /* !_WCHAR_T_DEFINED */ + #define _WCHAR_T_DEFINED + #ifndef _WCHAR_T_ +@@ -67,6 +71,7 @@ typedef unsigned short wchar_t; + #endif typedef wchar_t WCHAR; ++#endif typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR; + typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR; + typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR; |