2003-01-27 Danny Smith <dannysmith@users.sourceforge.net>

	* include/rpcnterr.h (RPC_X_INVALID_PIPE_OPERATION): Add
	define.
	* include/winbase.h (WAIT_TIMEOUT): Guard against prior
	definition.
	(WAIT_FAILED): Cast to DWORD.
	* include/winerror.h (WAIT_TIMEOUT): Guard against prior
	definition.

2003-01-27  Bang Jun-Young  <junyoung@netbsd.org>

	* include/winerror.h: Protect against multiple
	definition of WSA* error codes.
	* include/winsock.h: Likewise.
	* include/winsock2.h: Likewise.

2003-01-27  Bang Dong-Heui
	    Bang Jun-Young  <junyoung@netbsd.org>

	* include/winerror.h (ERROR_*, SEC_E_*,RPC_S_*, FRS_ERR_*,
	DNS_*, WSA*, WAIT_TIMEOUT): Add missing error codes.
	(RPC_X_INVALID_PIPE_OPERATION): Remove define.

1 files changed, 46 insertions, 44 deletions

diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h
index fa4b39c32..3cae8a935 100644
--- a/winsup/w32api/include/winsock2.h
+++ b/winsup/w32api/include/winsock2.h
@@ -405,6 +405,7 @@ struct sockproto {
 #define FD_MAX_EVENTS    10
 #define FD_ALL_EVENTS    ((1 << FD_MAX_EVENTS) - 1)
 
+#ifndef WSABASEERR
 #define WSABASEERR	10000
 #define WSAEINTR	(WSABASEERR+4)
 #define WSAEBADF	(WSABASEERR+9)
@@ -457,6 +458,51 @@ struct sockproto {
 #define WSATRY_AGAIN	(WSABASEERR+1002)
 #define WSANO_RECOVERY	(WSABASEERR+1003)
 #define WSANO_DATA	(WSABASEERR+1004)
+
+/* WinSock2 specific error codes */
+#define WSAENOMORE	(WSABASEERR+102)
+#define WSAECANCELLED	(WSABASEERR+103)
+#define WSAEINVALIDPROCTABLE	(WSABASEERR+104)
+#define WSAEINVALIDPROVIDER	(WSABASEERR+105)
+#define WSAEPROVIDERFAILEDINIT	(WSABASEERR+106)
+#define WSASYSCALLFAILURE	(WSABASEERR+107)
+#define WSASERVICE_NOT_FOUND	(WSABASEERR+108)
+#define WSATYPE_NOT_FOUND	(WSABASEERR+109)
+#define WSA_E_NO_MORE	(WSABASEERR+110)
+#define WSA_E_CANCELLED	(WSABASEERR+111)
+#define WSAEREFUSED	(WSABASEERR+112)
+ 
+/* WS QualityofService errors */
+#define WSA_QOS_RECEIVERS	(WSABASEERR + 1005)
+#define WSA_QOS_SENDERS	(WSABASEERR + 1006)
+#define WSA_QOS_NO_SENDERS	(WSABASEERR + 1007)
+#define WSA_QOS_NO_RECEIVERS	(WSABASEERR + 1008)
+#define WSA_QOS_REQUEST_CONFIRMED	(WSABASEERR + 1009)
+#define WSA_QOS_ADMISSION_FAILURE	(WSABASEERR + 1010)
+#define WSA_QOS_POLICY_FAILURE	(WSABASEERR + 1011)
+#define WSA_QOS_BAD_STYLE	(WSABASEERR + 1012)
+#define WSA_QOS_BAD_OBJECT	(WSABASEERR + 1013)
+#define WSA_QOS_TRAFFIC_CTRL_ERROR	(WSABASEERR + 1014)
+#define WSA_QOS_GENERIC_ERROR	(WSABASEERR + 1015)
+#define WSA_QOS_ESERVICETYPE	(WSABASEERR + 1016)
+#define WSA_QOS_EFLOWSPEC	(WSABASEERR + 1017)
+#define WSA_QOS_EPROVSPECBUF	(WSABASEERR + 1018)
+#define WSA_QOS_EFILTERSTYLE	(WSABASEERR + 1019)
+#define WSA_QOS_EFILTERTYPE	(WSABASEERR + 1020)
+#define WSA_QOS_EFILTERCOUNT	(WSABASEERR + 1021)
+#define WSA_QOS_EOBJLENGTH	(WSABASEERR + 1022)
+#define WSA_QOS_EFLOWCOUNT	(WSABASEERR + 1023)
+#define WSA_QOS_EUNKOWNPSOBJ	(WSABASEERR + 1024)
+#define WSA_QOS_EPOLICYOBJ	(WSABASEERR + 1025)
+#define WSA_QOS_EFLOWDESC	(WSABASEERR + 1026)
+#define WSA_QOS_EPSFLOWSPEC	(WSABASEERR + 1027)
+#define WSA_QOS_EPSFILTERSPEC	(WSABASEERR + 1028)
+#define WSA_QOS_ESDMODEOBJ	(WSABASEERR + 1029)
+#define WSA_QOS_ESHAPERATEOBJ	(WSABASEERR + 1030)
+#define WSA_QOS_RESERVED_PETYPE	(WSABASEERR + 1031)
+
+#endif /* !WSABASEERR */
+
 #define WSANO_ADDRESS	WSANO_DATA
 #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
 #define h_errno WSAGetLastError()
@@ -584,50 +630,6 @@ typedef struct timeval *LPTIMEVAL;
 #define	MSG_INTERRUPT	0x10
 #define	MSG_MAXIOVLEN	16
 
-/* WinSock2 specific error codes */
-#define	WSAEDISCON	(WSABASEERR+101)
-#define	WSAENOMORE	(WSABASEERR+102)
-#define	WSAECANCELLED	(WSABASEERR+103)
-#define	WSAEINVALIDPROCTABLE	(WSABASEERR+104)
-#define	WSAEINVALIDPROVIDER	(WSABASEERR+105)
-#define	WSAEPROVIDERFAILEDINIT	(WSABASEERR+106)
-#define	WSASYSCALLFAILURE	(WSABASEERR+107)
-#define	WSASERVICE_NOT_FOUND	(WSABASEERR+108)
-#define	WSATYPE_NOT_FOUND	(WSABASEERR+109)
-#define	WSA_E_NO_MORE	(WSABASEERR+110)
-#define	WSA_E_CANCELLED	(WSABASEERR+111)
-#define	WSAEREFUSED	(WSABASEERR+112)
- 
-/* WS QualityofService errors */
-#define  WSA_QOS_RECEIVERS  (WSABASEERR + 1005)
-#define  WSA_QOS_SENDERS    (WSABASEERR + 1006)
-#define  WSA_QOS_NO_SENDERS (WSABASEERR + 1007)
-#define  WSA_QOS_NO_RECEIVERS   (WSABASEERR + 1008)
-#define  WSA_QOS_REQUEST_CONFIRMED  (WSABASEERR + 1009)
-#define  WSA_QOS_ADMISSION_FAILURE  (WSABASEERR + 1010)
-#define  WSA_QOS_POLICY_FAILURE (WSABASEERR + 1011)
-#define  WSA_QOS_BAD_STYLE  (WSABASEERR + 1012)
-#define  WSA_QOS_BAD_OBJECT (WSABASEERR + 1013)
-#define  WSA_QOS_TRAFFIC_CTRL_ERROR (WSABASEERR + 1014)
-#define  WSA_QOS_GENERIC_ERROR  (WSABASEERR + 1015)
-#define  WSA_QOS_ESERVICETYPE   (WSABASEERR + 1016)
-#define  WSA_QOS_EFLOWSPEC	(WSABASEERR + 1017)
-#define  WSA_QOS_EPROVSPECBUF    (WSABASEERR + 1018)
-#define  WSA_QOS_EFILTERSTYLE   (WSABASEERR + 1019)
-#define  WSA_QOS_EFILTERTYPE    (WSABASEERR + 1020)
-#define  WSA_QOS_EFILTERCOUNT   (WSABASEERR + 1021)
-#define  WSA_QOS_EOBJLENGTH (WSABASEERR + 1022)
-#define  WSA_QOS_EFLOWCOUNT (WSABASEERR + 1023)
-#define  WSA_QOS_EUNKOWNPSOBJ   (WSABASEERR + 1024)
-#define  WSA_QOS_EPOLICYOBJ (WSABASEERR + 1025)
-#define  WSA_QOS_EFLOWDESC  (WSABASEERR + 1026)
-#define  WSA_QOS_EPSFLOWSPEC    (WSABASEERR + 1027)
-#define  WSA_QOS_EPSFILTERSPEC  (WSABASEERR + 1028)
-#define  WSA_QOS_ESDMODEOBJ (WSABASEERR + 1029)
-#define  WSA_QOS_ESHAPERATEOBJ  (WSABASEERR + 1030)
-#define  WSA_QOS_RESERVED_PETYPE    (WSABASEERR + 1031)
-
- 
 #define	WSAAPI	WINAPI
 #define WSAEVENT	HANDLE
 #define	LPWSAEVENT	LPHANDLE