From f324e5e92cdcb8ffe7296ad2dcb2762c6ed42ea3 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 26 Dec 1998 11:56:22 +0000 Subject: [PATCH] Removed the CN_xxx macros since they are not used, do not correspond to any Windows define and conflict with MFC defines. windows.h must provide all the definitions contained in winbase.h Some Xxx32 functions did not have the associated Xxx macro. --- include/windows.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/windows.h b/include/windows.h index fb0043a8144..2a08332ed09 100644 --- a/include/windows.h +++ b/include/windows.h @@ -11,7 +11,11 @@ extern "C" { #include "wintypes.h" +/* FIXME: Maybe we should try to get something from the Unix headers instead, this should be in windef.h by the way */ +#define MAX_PATH 260 + #ifndef DONT_INCLUDE_WINGDI +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #endif /* DONT_INCLUDE_WINGDI */ @@ -1164,11 +1168,6 @@ DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA) #define MS_RING_ON ((DWORD)0x0040) #define MS_RLSD_ON ((DWORD)0x0080) - -#define CN_RECEIVE 0x0001 -#define CN_TRANSMIT 0x0002 -/*#define CN_EVENT 0x0004*/ - typedef struct tagDCB16 { BYTE Id;