head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.32 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.30 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.28 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.26 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.24 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.22 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.20 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.18 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.16 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.14 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.12 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.10 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.8 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.6 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.4 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.2 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.4.0.22 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.20 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.18 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2; locks; strict; comment @# @; 1.5 date 2006.07.03.04.43.33; author kent; state dead; branches; next 1.4; 1.4 date 2003.09.21.16.03.40; author kent; state Exp; branches; next 1.3; 1.3 date 2003.04.10.15.25.46; author kent; state Exp; branches; next 1.2; 1.2 date 2002.03.18.03.25.47; author kent; state Exp; branches; next 1.1; 1.1 date 2001.10.21.12.39.06; author kent; state Exp; branches; next ; desc @@ 1.5 log @remove w32api because PEACE distribution now contains w32api @ text @$NetBSD: patch-ah,v 1.4 2003/09/21 16:03:40 kent Exp $ --- include/winnt.h.orig 2003-09-12 22:24:45.000000000 +0900 +++ include/winnt.h @@@@ -63,6 +63,10 @@@@ #endif typedef void* __ptr64 PVOID64; +#ifdef __NetBSDPE__ +#include +typedef uint16_t WCHAR; +#else #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef _WCHAR_T_ @@@@ -75,6 +79,7 @@@@ #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; @@@@ -2178,13 +2183,21 @@@@ #ifndef _SLIST_HEADER_ #define _SLIST_HEADER_ -#define SLIST_ENTRY SINGLE_LIST_ENTRY +#ifdef __NetBSDPE__ +# define W32_SLIST_ENTRY SINGLE_LIST_ENTRY +#else +# define SLIST_ENTRY SINGLE_LIST_ENTRY +#endif #define _SLIST_ENTRY _SINGLE_LIST_ENTRY #define PSLIST_ENTRY PSINGLE_LIST_ENTRY typedef union _SLIST_HEADER { ULONGLONG Alignment; _ANONYMOUS_STRUCT struct { +#ifdef __NetBSDPE__ + W32_SLIST_ENTRY Next; +#else SLIST_ENTRY Next; +#endif WORD Depth; WORD Sequence; } DUMMYSTRUCTNAME; @ 1.4 log @Update w32api to 2.4, and PEACE to 20030919 snapshot. This change fixes PR pkg/19049. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Stop using wchar_t. Bump PKGREVISION. @ text @d3 1 a3 1 --- include/winnt.h~ 2002-06-14 20:42:27.000000000 +0900 d5 3 a7 3 @@@@ -55,6 +55,10 @@@@ typedef unsigned short USHORT,*PUSHORT; typedef unsigned long ULONG,*PULONG; typedef char *PSZ; d16 1 a16 1 @@@@ -67,6 +71,7 @@@@ typedef unsigned short wchar_t; d24 23 @ 1.2 log @Sync with PEACE repositry. http://cvs.kshosen.ac.jp/cvsweb.cgi/peace/pkgsrc/devel/w32api/ Update the base w32api to 1.2. - Add accctrl.h and aclapi.h - Many bug fixes and new symbols - Improve WCHAR handling for netbsdpe @ text @d3 1 a3 1 --- include/winnt.h.orig Tue Dec 4 22:10:28 2001 d5 2 a6 1 @@@@ -52,15 +52,19 @@@@ d9 4 d14 4 a17 22 -#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 +# 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 */ d20 1 d22 2 @ 1.1 log @Sync with PEACE repositry. * Upgrade base distribution: w32api-0.4 -> w32api-1.1 * Create static libraries for UUID definitions. * Modify typedefs to avoid a bug of gcc. @ text @d3 1 a3 1 --- include/winnt.h.orig Mon Jul 16 01:01:27 2001 d5 2 a6 1 @@@@ -53,6 +53,7 @@@@ d9 25 a33 5 #define _WCHAR_T_DEFINED +#undef _BSD_WCHAR_T_ #ifndef _WCHAR_T_ #define _WCHAR_T_ #undef __need_wchar_t @