Update w32api to 2.4, and PEACE to 20030919 snapshot.

This change fixes PR pkg/19049.

6 files changed, 171 insertions, 30 deletions

diff --git a/devel/w32api/DEINSTALL b/devel/w32api/DEINSTALL
index 39ca09ffe4b..066a357e02a 100644
--- a/devel/w32api/DEINSTALL
+++ b/devel/w32api/DEINSTALL
@@ -1,5 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.3 2003/08/30 18:48:34 jlam Exp $
-# $PEACE: DEINSTALL,v 1.1 2002/08/21 02:02:26 kent Exp $
+# $NetBSD: DEINSTALL,v 1.4 2003/09/21 16:03:39 kent Exp $
 
 CROSSINC=${PKG_PREFIX}/cross/i386-netbsdpe/include
 
diff --git a/devel/w32api/INSTALL b/devel/w32api/INSTALL
index 1aac4ce5cb0..2dbb6bdd935 100644
--- a/devel/w32api/INSTALL
+++ b/devel/w32api/INSTALL
@@ -1,5 +1,4 @@
-# $NetBSD: INSTALL,v 1.3 2003/08/30 18:48:35 jlam Exp $
-# $PEACE: INSTALL,v 1.1 2002/08/21 02:02:27 kent Exp $
+# $NetBSD: INSTALL,v 1.4 2003/09/21 16:03:39 kent Exp $
 
 CROSSINC=${PKG_PREFIX}/cross/i386-netbsdpe/include
 
@@ -15,5 +14,6 @@ POST-INSTALL)
 #	cd ${CROSSINC} && ${LN} -sf i386 machine
 	${MKDIR} ${CROSSINC}/sys
 	${SED} "s/FSHIFT/SYS_PARAM_FSHIFT/g" /usr/include/sys/param.h > ${CROSSINC}/sys/param.h
+#	${SED} "s/extern _IO_/__declspec(dllimport) extern _IO_/g" /usr/include/g++/iostream.h > ${CROSSINC}/iostream.h
 	;;
 esac
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 96c3c8862af..44a1b85c502 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2003/08/30 22:51:15 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/21 16:03:39 kent Exp $
 # $PEACE: Makefile,v 1.21 2002/08/21 02:02:27 kent Exp $
 
-DISTNAME=	w32api-1.5-src
-PKGNAME=	w32api-1.5
-PKGREVISION=	2
+DISTNAME=	w32api-2.4-src
+PKGNAME=	w32api-2.4
+#PKGREVISION=	2
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mingw/}
-DISTFILES+=	${DISTNAME}.tar.gz pe-crt-1.2.tar.gz
-SITES_pe-crt-1.2.tar.gz=http://www.hauN.org/kent/
+DISTFILES+=	${DISTNAME}.tar.gz pe-crt-1.2.1.tar.gz
+SITES_pe-crt-1.2.1.tar.gz=http://www.hauN.org/kent/
 
 MAINTAINER=	peace-sacrifice@hauN.org
 HOMEPAGE=	http://www.mingw.org/
@@ -18,8 +18,10 @@ BUILD_DEPENDS+=	cross-i386-netbsdpe:../../cross/i386-netbsdpe
 
 PE_CC=		${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include
 PE_AR=		${CROSSBASE}/bin/i386-netbsdpe-ar
-CRTWRKSRC=	${WRKDIR}/pe-crt-1.2
-CFLAGS+=	-I${WRKDIR}/include
+CRTWRKSRC=	${WRKDIR}/pe-crt-1.2.1
+PE_CPPFLAGS+=	-I${WRKDIR}/include
+MAKE_FLAGS+=	PE_CPPFLAGS="${PE_CPPFLAGS}"
+FIXPATTERN=	s/(CALLBACK/ CALLBACK (/g; s/typedef \(.*\)(NTAPI/typedef \1 NTAPI (/g; s/typedef \(.*\)(WINAPI/typedef \1 WINAPI (/g; s/typedef \(.*\)(STDAPICALLTYPE/typedef \1 STDAPICALLTYPE (/g; s/typedef \(.*\)(APIENTRY/typedef \1 APIENTRY (/g; s/typedef \(.*\)(PASCAL/typedef \1 PASCAL (/g; s/typedef \(.*\)(STDCALL/typedef \1 STDCALL (/g; s/typedef \(.*\)(__RPC_API/typedef \1 __RPC_API (/g; s/typedef \(.*\)(__RPC_USER/typedef \1 __RPC_USER (/g; s/typedef \(.*\)(__stdcall/typedef \1 __stdcall (/g; s/typedef \(.*\)(__RPC_STUB/typedef \1 __RPC_STUB (/g
 
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
@@ -33,18 +35,30 @@ do-build:
 		&& ${PE_AR} r libdxguid.a dxguid.o \
 		&& ${PE_AR} r libuuid.a uuid.o
 	${MKDIR} ${WRKDIR}/include
+	${MKDIR} ${WRKDIR}/include/GL
+	${MKDIR} ${WRKDIR}/include/ddk
 	for i in ${WRKSRC}/include/*.h; do \
-		${SED} 's/(CALLBACK/ CALLBACK (/g; s/typedef \(.*\)(NTAPI/typedef \1 NTAPI (/g; s/typedef \(.*\)(WINAPI/typedef \1 WINAPI (/g; s/typedef \(.*\)(STDAPICALLTYPE/typedef \1 STDAPICALLTYPE (/g; s/typedef \(.*\)(APIENTRY/typedef \1 APIENTRY (/g; s/typedef \(.*\)(PASCAL/typedef \1 PASCAL (/g; s/typedef \(.*\)(STDCALL/typedef \1 STDCALL (/g; s/typedef \(.*\)(__RPC_API/typedef \1 __RPC_API (/g; s/typedef \(.*\)(__RPC_USER/typedef \1 __RPC_USER (/g; s/typedef \(.*\)(__stdcall/typedef \1 __stdcall (/g; s/typedef \(.*\)(__RPC_STUB/typedef \1 __RPC_STUB (/g' $$i > ${WRKDIR}/include/`basename $$i`; \
+		${SED} "${FIXPATTERN}" $$i > ${WRKDIR}/include/`basename $$i`; \
 	done
-	${_PKG_SILENT}cd ${CRTWRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	for i in ${WRKSRC}/include/GL/*.h; do \
+		${SED} "${FIXPATTERN}" $$i > ${WRKDIR}/include/GL/`basename $$i`; \
+	done
+	for i in ${WRKSRC}/include/ddk/*.h; do \
+		${SED} "${FIXPATTERN}" $$i > ${WRKDIR}/include/ddk/`basename $$i`; \
+	done
+	${_PKG_SILENT}cd ${CRTWRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
 do-install:
 	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include
 	${INSTALL_DATA} ${WRKDIR}/include/*.h ${CROSSBASE}/i386-netbsdpe/include
+	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include/GL
+	${INSTALL_DATA} ${WRKDIR}/include/GL/*.h ${CROSSBASE}/i386-netbsdpe/include/GL
+	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include/ddk
+	${INSTALL_DATA} ${WRKDIR}/include/ddk/*.h ${CROSSBASE}/i386-netbsdpe/include/ddk
 	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${CROSSBASE}/i386-netbsdpe/lib
 	${_PKG_SILENT}cd ${CRTWRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
-post-install:
-	PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+#post-install:
+#	PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/w32api/PLIST b/devel/w32api/PLIST
index d3c12998282..2854547f3b5 100644
--- a/devel/w32api/PLIST
+++ b/devel/w32api/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/21 12:59:17 kent Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/21 16:03:39 kent Exp $
+cross/i386-netbsdpe/include/GL/gl.h
+cross/i386-netbsdpe/include/GL/glext.h
+cross/i386-netbsdpe/include/GL/glu.h
 cross/i386-netbsdpe/include/accctrl.h
 cross/i386-netbsdpe/include/aclapi.h
 cross/i386-netbsdpe/include/basetsd.h
@@ -14,8 +17,89 @@ cross/i386-netbsdpe/include/custcntl.h
 cross/i386-netbsdpe/include/dbt.h
 cross/i386-netbsdpe/include/dde.h
 cross/i386-netbsdpe/include/ddeml.h
+cross/i386-netbsdpe/include/ddk/atm.h
+cross/i386-netbsdpe/include/ddk/batclass.h
+cross/i386-netbsdpe/include/ddk/cfg.h
+cross/i386-netbsdpe/include/ddk/cfgmgr32.h
+cross/i386-netbsdpe/include/ddk/d4drvif.h
+cross/i386-netbsdpe/include/ddk/d4iface.h
+cross/i386-netbsdpe/include/ddk/ddkmapi.h
+cross/i386-netbsdpe/include/ddk/hidclass.h
+cross/i386-netbsdpe/include/ddk/hidpi.h
+cross/i386-netbsdpe/include/ddk/hidusage.h
+cross/i386-netbsdpe/include/ddk/mcd.h
+cross/i386-netbsdpe/include/ddk/miniport.h
+cross/i386-netbsdpe/include/ddk/minitape.h
+cross/i386-netbsdpe/include/ddk/mountdev.h
+cross/i386-netbsdpe/include/ddk/mountmgr.h
+cross/i386-netbsdpe/include/ddk/ndis.h
+cross/i386-netbsdpe/include/ddk/ndisguid.h
+cross/i386-netbsdpe/include/ddk/ndistapi.h
+cross/i386-netbsdpe/include/ddk/ndiswan.h
+cross/i386-netbsdpe/include/ddk/netevent.h
+cross/i386-netbsdpe/include/ddk/netpnp.h
+cross/i386-netbsdpe/include/ddk/newdev.h
+cross/i386-netbsdpe/include/ddk/ntapi.h
+cross/i386-netbsdpe/include/ddk/ntdd8042.h
+cross/i386-netbsdpe/include/ddk/ntddbeep.h
+cross/i386-netbsdpe/include/ddk/ntddcdrm.h
+cross/i386-netbsdpe/include/ddk/ntddcdvd.h
+cross/i386-netbsdpe/include/ddk/ntddchgr.h
+cross/i386-netbsdpe/include/ddk/ntdddisk.h
+cross/i386-netbsdpe/include/ddk/ntddk.h
+cross/i386-netbsdpe/include/ddk/ntddkbd.h
+cross/i386-netbsdpe/include/ddk/ntddmou.h
+cross/i386-netbsdpe/include/ddk/ntddndis.h
+cross/i386-netbsdpe/include/ddk/ntddpar.h
+cross/i386-netbsdpe/include/ddk/ntddpcm.h
+cross/i386-netbsdpe/include/ddk/ntddscsi.h
+cross/i386-netbsdpe/include/ddk/ntddser.h
+cross/i386-netbsdpe/include/ddk/ntddstor.h
+cross/i386-netbsdpe/include/ddk/ntddtape.h
+cross/i386-netbsdpe/include/ddk/ntddtdi.h
+cross/i386-netbsdpe/include/ddk/ntddvdeo.h
+cross/i386-netbsdpe/include/ddk/ntddvol.h
+cross/i386-netbsdpe/include/ddk/ntifs.h
+cross/i386-netbsdpe/include/ddk/ntpoapi.h
+cross/i386-netbsdpe/include/ddk/ntstatus.h
+cross/i386-netbsdpe/include/ddk/parallel.h
+cross/i386-netbsdpe/include/ddk/pfhook.h
+cross/i386-netbsdpe/include/ddk/poclass.h
+cross/i386-netbsdpe/include/ddk/scsi.h
+cross/i386-netbsdpe/include/ddk/scsiscan.h
+cross/i386-netbsdpe/include/ddk/scsiwmi.h
+cross/i386-netbsdpe/include/ddk/smbus.h
+cross/i386-netbsdpe/include/ddk/srb.h
+cross/i386-netbsdpe/include/ddk/storport.h
+cross/i386-netbsdpe/include/ddk/tdi.h
+cross/i386-netbsdpe/include/ddk/tdiinfo.h
+cross/i386-netbsdpe/include/ddk/tdikrnl.h
+cross/i386-netbsdpe/include/ddk/tdistat.h
+cross/i386-netbsdpe/include/ddk/tvout.h
+cross/i386-netbsdpe/include/ddk/upssvc.h
+cross/i386-netbsdpe/include/ddk/usb.h
+cross/i386-netbsdpe/include/ddk/usb100.h
+cross/i386-netbsdpe/include/ddk/usbcamdi.h
+cross/i386-netbsdpe/include/ddk/usbdi.h
+cross/i386-netbsdpe/include/ddk/usbioctl.h
+cross/i386-netbsdpe/include/ddk/usbiodef.h
+cross/i386-netbsdpe/include/ddk/usbscan.h
+cross/i386-netbsdpe/include/ddk/usbuser.h
+cross/i386-netbsdpe/include/ddk/video.h
+cross/i386-netbsdpe/include/ddk/videoagp.h
+cross/i386-netbsdpe/include/ddk/win2k.h
+cross/i386-netbsdpe/include/ddk/winddi.h
+cross/i386-netbsdpe/include/ddk/winddk.h
+cross/i386-netbsdpe/include/ddk/winnt4.h
+cross/i386-netbsdpe/include/ddk/winxp.h
+cross/i386-netbsdpe/include/ddk/ws2san.h
+cross/i386-netbsdpe/include/ddk/xfilter.h
 cross/i386-netbsdpe/include/dlgs.h
+cross/i386-netbsdpe/include/docobj.h
+cross/i386-netbsdpe/include/exdisp.h
+cross/i386-netbsdpe/include/exdispid.h
 cross/i386-netbsdpe/include/httpext.h
+cross/i386-netbsdpe/include/idispids.h
 cross/i386-netbsdpe/include/imagehlp.h
 cross/i386-netbsdpe/include/imm.h
 cross/i386-netbsdpe/include/initguid.h
@@ -54,12 +138,16 @@ cross/i386-netbsdpe/include/lzexpand.h
 cross/i386-netbsdpe/include/mapi.h
 cross/i386-netbsdpe/include/mciavi.h
 cross/i386-netbsdpe/include/mcx.h
+cross/i386-netbsdpe/include/mgmtapi.h
 cross/i386-netbsdpe/include/mmsystem.h
+cross/i386-netbsdpe/include/mshtml.h
 cross/i386-netbsdpe/include/mswsock.h
 cross/i386-netbsdpe/include/nb30.h
 cross/i386-netbsdpe/include/nddeapi.h
 cross/i386-netbsdpe/include/nspapi.h
 cross/i386-netbsdpe/include/ntdef.h
+cross/i386-netbsdpe/include/ntdll.h
+cross/i386-netbsdpe/include/ntldap.h
 cross/i386-netbsdpe/include/ntsecapi.h
 cross/i386-netbsdpe/include/ntsecpkg.h
 cross/i386-netbsdpe/include/oaidl.h
@@ -71,6 +159,7 @@ cross/i386-netbsdpe/include/odbcinst.h
 cross/i386-netbsdpe/include/ole.h
 cross/i386-netbsdpe/include/ole2.h
 cross/i386-netbsdpe/include/ole2ver.h
+cross/i386-netbsdpe/include/oleacc.h
 cross/i386-netbsdpe/include/oleauto.h
 cross/i386-netbsdpe/include/olectl.h
 cross/i386-netbsdpe/include/olectlid.h
@@ -78,6 +167,7 @@ cross/i386-netbsdpe/include/oledlg.h
 cross/i386-netbsdpe/include/oleidl.h
 cross/i386-netbsdpe/include/pbt.h
 cross/i386-netbsdpe/include/poppack.h
+cross/i386-netbsdpe/include/powrprof.h
 cross/i386-netbsdpe/include/prsht.h
 cross/i386-netbsdpe/include/psapi.h
 cross/i386-netbsdpe/include/pshpack1.h
@@ -86,6 +176,7 @@ cross/i386-netbsdpe/include/pshpack4.h
 cross/i386-netbsdpe/include/pshpack8.h
 cross/i386-netbsdpe/include/rapi.h
 cross/i386-netbsdpe/include/ras.h
+cross/i386-netbsdpe/include/rasdlg.h
 cross/i386-netbsdpe/include/raserror.h
 cross/i386-netbsdpe/include/rassapi.h
 cross/i386-netbsdpe/include/regstr.h
@@ -103,22 +194,30 @@ cross/i386-netbsdpe/include/rpcproxy.h
 cross/i386-netbsdpe/include/schannel.h
 cross/i386-netbsdpe/include/schnlsp.h
 cross/i386-netbsdpe/include/scrnsave.h
+cross/i386-netbsdpe/include/secext.h
 cross/i386-netbsdpe/include/security.h
+cross/i386-netbsdpe/include/servprov.h
 cross/i386-netbsdpe/include/setupapi.h
 cross/i386-netbsdpe/include/shellapi.h
 cross/i386-netbsdpe/include/shlguid.h
 cross/i386-netbsdpe/include/shlobj.h
+cross/i386-netbsdpe/include/shlwapi.h
+cross/i386-netbsdpe/include/snmp.h
 cross/i386-netbsdpe/include/sql.h
 cross/i386-netbsdpe/include/sqlext.h
 cross/i386-netbsdpe/include/sqltypes.h
 cross/i386-netbsdpe/include/sqlucode.h
 cross/i386-netbsdpe/include/sspi.h
 cross/i386-netbsdpe/include/subauth.h
+cross/i386-netbsdpe/include/svcguid.h
 cross/i386-netbsdpe/include/tlhelp32.h
 cross/i386-netbsdpe/include/unknwn.h
 cross/i386-netbsdpe/include/userenv.h
+cross/i386-netbsdpe/include/vfw.h
 cross/i386-netbsdpe/include/w32api.h
+cross/i386-netbsdpe/include/winable.h
 cross/i386-netbsdpe/include/winbase.h
+cross/i386-netbsdpe/include/winber.h
 cross/i386-netbsdpe/include/wincon.h
 cross/i386-netbsdpe/include/wincrypt.h
 cross/i386-netbsdpe/include/windef.h
@@ -128,26 +227,32 @@ cross/i386-netbsdpe/include/winerror.h
 cross/i386-netbsdpe/include/wingdi.h
 cross/i386-netbsdpe/include/wininet.h
 cross/i386-netbsdpe/include/winioctl.h
+cross/i386-netbsdpe/include/winldap.h
 cross/i386-netbsdpe/include/winnetwk.h
 cross/i386-netbsdpe/include/winnls.h
 cross/i386-netbsdpe/include/winnt.h
 cross/i386-netbsdpe/include/winperf.h
 cross/i386-netbsdpe/include/winreg.h
 cross/i386-netbsdpe/include/winresrc.h
+cross/i386-netbsdpe/include/winsnmp.h
 cross/i386-netbsdpe/include/winsock.h
 cross/i386-netbsdpe/include/winsock2.h
 cross/i386-netbsdpe/include/winspool.h
 cross/i386-netbsdpe/include/winsvc.h
 cross/i386-netbsdpe/include/winuser.h
 cross/i386-netbsdpe/include/winver.h
+cross/i386-netbsdpe/include/ws2spi.h
 cross/i386-netbsdpe/include/ws2tcpip.h
+cross/i386-netbsdpe/include/wsahelp.h
+cross/i386-netbsdpe/include/wsipx.h
 cross/i386-netbsdpe/include/wsnetbs.h
 cross/i386-netbsdpe/include/wtypes.h
 cross/i386-netbsdpe/include/zmouse.h
 cross/i386-netbsdpe/lib/crt0.o
 cross/i386-netbsdpe/lib/crt0dll.o
-cross/i386-netbsdpe/lib/crt0libc.o
 cross/i386-netbsdpe/lib/crt0win.o
 cross/i386-netbsdpe/lib/libdxguid.a
 cross/i386-netbsdpe/lib/libpeasu.a
 cross/i386-netbsdpe/lib/libuuid.a
+@dirrm cross/i386-netbsdpe/include/GL
+@dirrm cross/i386-netbsdpe/include/ddk
diff --git a/devel/w32api/distinfo b/devel/w32api/distinfo
index a593e2d271b..c9601e194de 100644
--- a/devel/w32api/distinfo
+++ b/devel/w32api/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2003/04/10 15:25:45 kent Exp $
+$NetBSD: distinfo,v 1.7 2003/09/21 16:03:40 kent Exp $
 
-SHA1 (w32api-1.5-src.tar.gz) = 8bbfd451f55e0df2d4bca00af1e22a41f7ee5311
-Size (w32api-1.5-src.tar.gz) = 514129 bytes
-SHA1 (pe-crt-1.2.tar.gz) = b242b836921dba919a9ce6ecefd1a160cb6ef2a6
-Size (pe-crt-1.2.tar.gz) = 4339 bytes
+SHA1 (w32api-2.4-src.tar.gz) = 008bf1b468bedf8a6c538f1e61d8003b0116c84e
+Size (w32api-2.4-src.tar.gz) = 946314 bytes
+SHA1 (pe-crt-1.2.1.tar.gz) = 3468a498cf8e8fa1daf7b437b5c9e88471c1cc6e
+Size (pe-crt-1.2.1.tar.gz) = 4394 bytes
 SHA1 (patch-aa) = 681fa944e43558fa905615f240c26bb8d657eeae
 SHA1 (patch-ab) = 618a2b5adda9f0093c90e9418e69f7ac6d811457
 SHA1 (patch-ac) = b565080d6ce53b98902e659a325d5549203741e8
 SHA1 (patch-ag) = 03b48ea8781815c5a170d9e80fe706dc50d07b04
-SHA1 (patch-ah) = 4d8258d263c512ff4e9e040e60f68878fb59928d
+SHA1 (patch-ah) = 0f2a3a062fbd2505a2c26457e448bd104dd3e7ef
 SHA1 (patch-ai) = 45129bc82dda126fdefbe1c857e14acaeedd7c5c
diff --git a/devel/w32api/patches/patch-ah b/devel/w32api/patches/patch-ah
index 58b73b73d45..ba76025cc87 100644
--- a/devel/w32api/patches/patch-ah
+++ b/devel/w32api/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.3 2003/04/10 15:25:46 kent Exp $
+$NetBSD: patch-ah,v 1.4 2003/09/21 16:03:40 kent Exp $
 
---- include/winnt.h~	2002-06-14 20:42:27.000000000 +0900
+--- include/winnt.h.orig	2003-09-12 22:24:45.000000000 +0900
 +++ include/winnt.h
-@@ -55,6 +55,10 @@ typedef unsigned short USHORT,*PUSHORT;
- typedef unsigned long ULONG,*PULONG;
- typedef char *PSZ;
+@@ -63,6 +63,10 @@
+ #endif
+ typedef void* __ptr64 PVOID64;
  
 +#ifdef __NetBSDPE__
 +#include <stdint.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.3 2003/04/10 15:25:46 kent Exp $
  #ifndef _WCHAR_T_DEFINED
  #define _WCHAR_T_DEFINED
  #ifndef _WCHAR_T_
-@@ -67,6 +71,7 @@ typedef unsigned short wchar_t;
+@@ -75,6 +79,7 @@
  #endif
  
  typedef wchar_t WCHAR;
@@ -21,3 +21,26 @@ $NetBSD: patch-ah,v 1.3 2003/04/10 15:25:46 kent Exp $
  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;