2002-07-25 Mattia Barbon <mbarbon@dsi.unive.it>

	* include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST.
	* include/commdlg.h: Likewise.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4e66ca7a6d5b90e8c979084e438ed31eaf3fdd33..43ace8fe6f598c5934708d918db4d763abe2e44f 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+       * include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST.
+       * include/commdlg.h: Likewise.
+
 2002-07-24  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * 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 a03aeb66dcacd607df137a945aaa29757eefea3c..f232c2084b208d2bfe639c560eaa1519f6c374b2 100644 (file)
--- 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 77415a1102af3ca7b14b49cd911ff3a030e8d042..254171c5eefedd9b57b35ba97745ce58bbafbb95 100644 (file)
--- 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)