diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-08-13 03:33:10 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-08-13 03:33:10 +0400 |
| commit | 3317419d1aa620af3d246fd4e3506d046be23173 (patch) | |
| tree | 4202f9fd0244bd5a8e1cb6c74032bf10ec6e6bb7 /winsup/w32api | |
| parent | 03a0a275b57fb45cabf87683bc1715f64b6c288a (diff) | |
* include/commdlg.h: Don't include COM headers if __OBJC__.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/commdlg.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 86c4f6184..a3b1a3f4f 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 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): Add prototypes. diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h index 254171c5e..f6ae226e0 100644 --- 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 */ |