drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Danny Smith 2002-08-12 23:33:10 +00:00
parent 03a0a275b5
commit 3317419d1a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/w32api/ChangeLog
View File

@ -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> 2002-08-13 Danny Smith <dannysmith@users.sourceforge.net>
* include/wincrypt.h (CryptDuplicateHash, CryptDuplicateKey): * include/wincrypt.h (CryptDuplicateHash, CryptDuplicateKey):

8
winsup/w32api/include/commdlg.h
View File

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