* include/commdlg.h: Don't include COM headers if __OBJC__.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 86c4f6184a974308f7c74221bc00ce83361cf437..a3b1a3f4f771e66830c94b78b97ebc989076d545 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-13  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/commdlg.h: Don't include COM headers or use
+       COM-dependent symbols if __OBJC__.
+
 2002-08-13  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/wincrypt.h (CryptDuplicateHash, CryptDuplicateKey):

diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h
index 254171c5eefedd9b57b35ba97745ce58bbafbb95..f6ae226e0e32e77254a4895bf6a28a65579f0b81 100644 (file)
--- a/winsup/w32api/include/commdlg.h
+++ b/winsup/w32api/include/commdlg.h
@@ -436,7 +436,7 @@ typedef struct tagPDW {
        HANDLE hPrintTemplate;
        HANDLE hSetupTemplate;
 } PRINTDLGW,*LPPRINTDLGW;
-#if (WINVER >= 0x0500)
+#if (WINVER >= 0x0500) && !defined (__OBJC__)
 #include <unknwn.h>  /* for LPUNKNOWN  */ 
 #include <prsht.h>   /* for HPROPSHEETPAGE  */
 typedef struct tagPRINTPAGERANGE {
@@ -510,7 +510,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA);
 BOOL WINAPI PrintDlgW(LPPRINTDLGW);
 HWND WINAPI ReplaceTextA(LPFINDREPLACEA);
 HWND WINAPI ReplaceTextW(LPFINDREPLACEW);
-#if (WINVER >= 0x0500) 
+#if (WINVER >= 0x0500) && !defined (__OBJC__)
 HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA);
 HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW);
 #endif /* WINVER >= 0x0500 */
@@ -539,7 +539,7 @@ typedef PRINTDLGW PRINTDLG,*LPPRINTDLG;
 #define PageSetupDlg PageSetupDlgW
 #define PrintDlg PrintDlgW
 #define ReplaceText ReplaceTextW
-#if (WINVER >= 0x0500) 
+#if (WINVER >= 0x0500) && !defined (__OBJC__)
 typedef PRINTDLGEXW PRINTDLGEX, *LPPRINTDLGEX;
 #define PrintDlgEx PrintDlgExW
 #endif /* WINVER >= 0x0500 */
@@ -567,7 +567,7 @@ typedef PRINTDLGA PRINTDLG,*LPPRINTDLG;
 #define PageSetupDlg PageSetupDlgA
 #define PrintDlg PrintDlgA
 #define ReplaceText ReplaceTextA
-#if (WINVER >= 0x0500) 
+#if (WINVER >= 0x0500) && !defined (__OBJC__)
 typedef PRINTDLGEXA PRINTDLGEX, *LPPRINTDLGEX;
 #define PrintDlgEx PrintDlgExA
 #endif /* WINVER >= 0x0500 */