diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 11:56:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 11:56:39 +0000 |
| commit | 4bd0d90d73683a65c1ff807c9715039d7d837a25 (patch) | |
| tree | 48c4e20b4f4c3de47646b37678a59a694bdfdb2c /avmedia | |
| parent | 6717cc723f0967215b20bb5aa8a2124738c8eb4d (diff) | |
INTEGRATION: CWS mingwport10 (1.2.4); FILE MERGED
2008/01/28 15:32:40 vg 1.2.4.1: #i85437# catch-up fixes for m243
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/win/interface.hxx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx index f0feb90038a4..f10ac27fe6c6 100644 --- a/avmedia/source/win/interface.hxx +++ b/avmedia/source/win/interface.hxx @@ -4,9 +4,9 @@ * * $RCSfile: interface.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ihi $ $Date: 2008-01-15 13:29:33 $ + * last change: $Author: ihi $ $Date: 2008-02-04 12:56:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,10 @@ extern "C" const CLSID CLSID_MediaDet; extern "C" const IID IID_IMediaDet; struct ISampleGrabber; -struct __declspec(uuid("65BD0710-24D2-4ff7-9324-ED2E5D3ABAFA")) __declspec(novtable) +struct +#ifndef __MINGW32__ +__declspec(uuid("65BD0710-24D2-4ff7-9324-ED2E5D3ABAFA")) __declspec(novtable) +#endif IMediaDet : public IUnknown { public: @@ -83,7 +86,10 @@ public: }; extern "C" const IID IID_ISampleGrabberCB; -struct __declspec(uuid("0579154A-2B53-4994-B0D0-E773148EFF85")) __declspec(novtable) +struct +#ifndef __MINGW32__ +__declspec(uuid("0579154A-2B53-4994-B0D0-E773148EFF85")) __declspec(novtable) +#endif ISampleGrabberCB : public IUnknown { public: @@ -97,7 +103,10 @@ public: }; extern "C" const IID IID_ISampleGrabber; -struct __declspec(uuid("6B652FFF-11FE-4fce-92AD-0266B5D7C78F")) __declspec(novtable) +struct +#ifndef __MINGW32__ +__declspec(uuid("6B652FFF-11FE-4fce-92AD-0266B5D7C78F")) __declspec(novtable) +#endif ISampleGrabber : public IUnknown { public: |