From d2f9f641d970562d29e79fd5cf1afe8ccb39bfb5 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 27 Jan 2003 07:15:17 +0000 Subject: 2003-01-27 Danny Smith * 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 * 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 * 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. --- winsup/w32api/include/winbase.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'winsup/w32api/include/winbase.h') diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index b7bc3271e..e53741999 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -361,10 +361,12 @@ extern "C" { #define MAXIMUM_SUSPEND_COUNT 0x7F #define WAIT_OBJECT_0 0 #define WAIT_ABANDONED_0 128 -#define WAIT_TIMEOUT 0x102 +#ifndef WAIT_TIMEOUT /* also in winerror.h */ +#define WAIT_TIMEOUT 258 +#endif #define WAIT_IO_COMPLETION 0xC0 #define WAIT_ABANDONED 128 -#define WAIT_FAILED 0xFFFFFFFF +#define WAIT_FAILED ((DWORD)0xFFFFFFFF) #define PURGE_TXABORT 1 #define PURGE_RXABORT 2 #define PURGE_TXCLEAR 4 -- cgit v1.2.3