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.

6 files changed, 39 insertions, 35 deletions

diff --git a/devel/w32api/patches/patch-aa b/devel/w32api/patches/patch-aa
deleted file mode 100644
index f205828b3a0..00000000000
--- a/devel/w32api/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/30 03:20:51 minoura Exp $
---- lib/dinput.c.orig	Mon May 15 01:20:35 2000
-+++ lib/dinput.c	Mon Nov 20 05:55:28 2000
-@@ -23,6 +23,7 @@
- 
- #if defined(__LCC__) || defined(__GNUC__)
- #include <windows.h>
-+#undef _BSD_WCHAR_T_
- #include <objbase.h>
- #else
- #include <basetyps.h>
diff --git a/devel/w32api/patches/patch-ab b/devel/w32api/patches/patch-ab
deleted file mode 100644
index 64ebe38574c..00000000000
--- a/devel/w32api/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/01/30 03:20:51 minoura Exp $
---- lib/dxguid.c.orig	Mon May 15 01:20:35 2000
-+++ lib/dxguid.c	Mon Nov 20 05:57:28 2000
-@@ -25,6 +25,7 @@
- #if defined(__LCC__) || defined(__GNUC__)
- #define INITGUID 1
- #include <windows.h>
-+#undef _BSD_WCHAR_T_
- #include <objbase.h>
- #else
- #include <basetyps.h>
diff --git a/devel/w32api/patches/patch-ac b/devel/w32api/patches/patch-ac
deleted file mode 100644
index 279a05c7028..00000000000
--- a/devel/w32api/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/01/30 03:20:51 minoura Exp $
-
---- include/shellapi.h.orig	Thu Oct 19 04:35:30 2000
-+++ include/shellapi.h
-@@ -183,7 +183,7 @@
- 	WCHAR szTypeName[80];
- } SHFILEINFOW;
- 
--LPWSTR *CommandLineToArgvW(LPCWSTR,int*);
-+LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*);
- void WINAPI DragAcceptFiles(HWND,BOOL);
- void WINAPI DragFinish(HDROP);
- UINT WINAPI DragQueryFileA(HDROP,UINT,LPSTR,UINT);
diff --git a/devel/w32api/patches/patch-ag b/devel/w32api/patches/patch-ag
new file mode 100644
index 00000000000..60bf4a2b54b
--- /dev/null
+++ b/devel/w32api/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2001/10/21 12:39:06 kent Exp $
+
+--- include/winuser.h.orig	Sun Jul 15 23:53:24 2001
++++ include/winuser.h
+@@ -7,6 +7,9 @@
+ #define FALT	16
+ #define FCONTROL	8
+ #define FNOINVERT	2
++#ifdef FSHIFT
++# error FSHIFT is already defined!!!
++#endif
+ #define FSHIFT	4
+ #define FVIRTKEY	1
+ #define ATF_TIMEOUTON	1
diff --git a/devel/w32api/patches/patch-ah b/devel/w32api/patches/patch-ah
new file mode 100644
index 00000000000..5fd99b5c985
--- /dev/null
+++ b/devel/w32api/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2001/10/21 12:39:06 kent Exp $
+
+--- include/winnt.h.orig	Mon Jul 16 01:01:27 2001
++++ include/winnt.h
+@@ -53,6 +53,7 @@
+ 
+ #ifndef _WCHAR_T_DEFINED
+ #define _WCHAR_T_DEFINED
++#undef _BSD_WCHAR_T_
+ #ifndef _WCHAR_T_
+ #define _WCHAR_T_
+ #undef __need_wchar_t
diff --git a/devel/w32api/patches/patch-ai b/devel/w32api/patches/patch-ai
new file mode 100644
index 00000000000..ce9b2d015ab
--- /dev/null
+++ b/devel/w32api/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2001/10/21 12:39:07 kent Exp $
+
+--- include/windows.h.orig	Thu Aug 30 13:25:59 2001
++++ include/windows.h
+@@ -142,7 +142,7 @@
+ #define __USE_W32_SOCKETS
+ #endif
+ #endif
+-#if defined(__USE_W32_SOCKETS) || !(defined(__CYGWIN__) || defined(__MSYS__) || defined(_UWIN))
++#if defined(__USE_W32_SOCKETS) || !(defined(__CYGWIN__) || defined(__MSYS__) || defined(_UWIN) || defined(__NetBSDPE__))
+ #if (_WIN32_WINNT >= 0x0400)  && (__W32API_MAJOR_VERSION > 0)
+ #include <winsock2.h>
+ /*