From b0054da2c0c42c26f4af141ffe57dc018e7b2ab8 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 24 Jul 2002 21:50:49 +0000 Subject: [PATCH] 2002-07-25 Mattia Barbon * include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST. * include/commdlg.h: Likewise. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/commctrl.h | 4 +++- winsup/w32api/include/commdlg.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 4e66ca7a6..43ace8fe6 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2002-07-25 Mattia Barbon + + * include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST. + * include/commdlg.h: Likewise. + 2002-07-24 Danny Smith * include/oleauto.h (V_UNION): Correct definition for case of diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index a03aeb66d..f232c2084 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -167,8 +167,10 @@ extern "C" { #define TTN_LAST ((UINT)-549) #define TCN_FIRST ((UINT)-550) #define TCN_LAST ((UINT)-580) -#define CDN_FIRST ((UINT)-601) +#ifndef CDN_FIRST +#define CDN_FIRST ((UINT)-601) /* also in commdlg.h */ #define CDN_LAST ((UINT)-699) +#endif #define TBN_FIRST ((UINT)-700) #define TBN_LAST ((UINT)-720) #define UDN_FIRST ((UINT)-721) diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h index 77415a110..254171c5e 100644 --- a/winsup/w32api/include/commdlg.h +++ b/winsup/w32api/include/commdlg.h @@ -23,8 +23,10 @@ extern "C" { #define SETRGBSTRINGW L"commdlg_SetRGBColor" #define HELPMSGSTRINGW L"commdlg_help" #define FINDMSGSTRINGW L"commdlg_FindReplace" +#ifndef CDN_FIRST #define CDN_FIRST ((UINT)-601) /* also in commctrl.h */ #define CDN_LAST ((UINT)-699) +#endif #define CDN_INITDONE CDN_FIRST #define CDN_SELCHANGE (CDN_FIRST-1U) #define CDN_FOLDERCHANGE (CDN_FIRST-2U)