diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 00:22:19 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 00:22:19 +0000 |
| commit | d2d223b5802d14e040edec3bff7a10b5eb15d96b (patch) | |
| tree | d59dc3b926d78d2c98285dfbd41ffc91fd43a8cd /winsup/w32api/include/commdlg.h | |
| parent | e7a8c11c0fa11eb9eac20a1fc279bcce03b77409 (diff) | |
| download | cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.tar.gz cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.tar.bz2 cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.zip | |
* include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/basetyps.h: Likewise.
(_COM_interface): New define.
(interface): Define to _COM_interface, conditional on !__OBJC__.
Replace 'interface' with '_COM_interface', throughout.
* include/comcat.h: Replace 'interface' with '_COM_interface', throughout.
* include/commdlg.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/docobj.h: Replace 'interface' with '_COM_interface', throughout.
* include/mshtml.h: Likewise.
* include/oaidl.h: Likewise.
* include/objfwd.h: Likewise.
* include/objidl.h: Likewise.
* include/ocidl.h: Likwise.
* include/olectl.h: Likewise.
* include/oleidl.h: Likewise.
* include/shlobj.h: Likewise.
* include/shlwapi.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/vfw.h: Likewise.
* include/windows.h. Likewise. Add comment.
* include/directx/d3d9.h: Replace 'interface' with '_COM_interface',
throughout.
* lib/test.c: Replace __OBJC__ guard with _OBJC_NO_COM.
Add test for conflict with '@interface'
Diffstat (limited to 'winsup/w32api/include/commdlg.h')
| -rw-r--r-- | winsup/w32api/include/commdlg.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h index dfce3cf8f..4c38774c2 100644 --- a/winsup/w32api/include/commdlg.h +++ b/winsup/w32api/include/commdlg.h @@ -466,7 +466,7 @@ typedef struct tagPDW { HANDLE hPrintTemplate; HANDLE hSetupTemplate; } PRINTDLGW,*LPPRINTDLGW; -#if (WINVER >= 0x0500) && !defined (__OBJC__) +#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM) #include <unknwn.h> /* for LPUNKNOWN */ #include <prsht.h> /* for HPROPSHEETPAGE */ typedef struct tagPRINTPAGERANGE { @@ -540,7 +540,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA); BOOL WINAPI PrintDlgW(LPPRINTDLGW); HWND WINAPI ReplaceTextA(LPFINDREPLACEA); HWND WINAPI ReplaceTextW(LPFINDREPLACEW); -#if (WINVER >= 0x0500) && !defined (__OBJC__) +#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM) HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA); HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW); #endif /* WINVER >= 0x0500 */ @@ -569,7 +569,7 @@ typedef PRINTDLGW PRINTDLG,*LPPRINTDLG; #define PageSetupDlg PageSetupDlgW #define PrintDlg PrintDlgW #define ReplaceText ReplaceTextW -#if (WINVER >= 0x0500) && !defined (__OBJC__) +#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM) typedef PRINTDLGEXW PRINTDLGEX, *LPPRINTDLGEX; #define PrintDlgEx PrintDlgExW #endif /* WINVER >= 0x0500 */ @@ -597,7 +597,7 @@ typedef PRINTDLGA PRINTDLG,*LPPRINTDLG; #define PageSetupDlg PageSetupDlgA #define PrintDlg PrintDlgA #define ReplaceText ReplaceTextA -#if (WINVER >= 0x0500) && !defined (__OBJC__) +#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM) typedef PRINTDLGEXA PRINTDLGEX, *LPPRINTDLGEX; #define PrintDlgEx PrintDlgExA #endif /* WINVER >= 0x0500 */ |