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/vfw.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/vfw.h')
| -rw-r--r-- | winsup/w32api/include/vfw.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/winsup/w32api/include/vfw.h b/winsup/w32api/include/vfw.h index 842c4e982..755edfcc1 100644 --- a/winsup/w32api/include/vfw.h +++ b/winsup/w32api/include/vfw.h @@ -10,7 +10,7 @@ #ifndef _MMSYSTEM_H #include <mmsystem.h> #endif -#if !defined (_OLE2_H) && !defined (__OBJC__) +#if !defined (_OLE2_H) && !defined (_OBJC_NO_COM) #include <ole2.h> #endif @@ -633,7 +633,7 @@ typedef struct _AVICOMPRESSOPTIONS { DWORD dwInterleaveEvery; } AVICOMPRESSOPTIONS, *LPAVICOMPRESSOPTIONS,*PAVICOMPRESSOPTIONS; -#if !defined (__OBJC__) +#if !defined (_OBJC_NO_COM) #define DEFINE_AVIGUID(name,l,w1,w2) DEFINE_GUID(name,l,w1,w2,0xC0,0,0,0,0,0,0,0x46) DEFINE_AVIGUID(IID_IAVIFile,0x00020020,0,0); DEFINE_AVIGUID(IID_IAVIStream,0x00020021,0,0); @@ -720,7 +720,7 @@ DECLARE_INTERFACE_(IGetFrame, IUnknown) }; #undef INTERFACE typedef IGetFrame *PGETFRAME; -#endif /* !defined (__OBJC__) */ +#endif /* !defined (_OBJC_NO_COM) */ DWORD VFWAPI VideoForWindowsVersion(VOID); LONG VFWAPI InitVFW(VOID); @@ -746,7 +746,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS,LPBITMAPINFO); void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS); LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS,UINT,LPVOID,BOOL*,LONG*); void VFWAPI ICCompressorFree(PCOMPVARS); -#if !defined (__OBJC__) +#if !defined (_OBJC_NO_COM) ULONG WINAPI AVIStreamAddRef(PAVISTREAM); ULONG WINAPI AVIStreamRelease(PAVISTREAM); HRESULT WINAPI AVIStreamCreate(PAVISTREAM*,LONG,LONG,CLSID*); @@ -811,7 +811,7 @@ HRESULT WINAPI AVIFileEndRecord(PAVIFILE); HRESULT WINAPI AVIClearClipboard(VOID); HRESULT WINAPI AVIGetFromClipboard(PAVIFILE*); HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE); -#endif /* __OBJC__ */ +#endif /* _OBJC_NO_COM */ #ifdef OFN_READONLY BOOL WINAPI GetOpenFileNamePreviewA(LPOPENFILENAMEA); BOOL WINAPI GetOpenFileNamePreviewW(LPOPENFILENAMEW); |