diff options
| author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-23 09:58:01 +0000 |
|---|---|---|
| committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-23 09:58:01 +0000 |
| commit | a98fcdb7b3b147c15bd089b5a36fe3db0b0fd55a (patch) | |
| tree | 62c860a2d965c9eb17c8c4d14f4fda9b36d2ff44 /loader/com.h | |
| parent | e33a1695bab717d2dd3a7e5c289ed822437b187f (diff) | |
| download | mpv-a98fcdb7b3b147c15bd089b5a36fe3db0b0fd55a.tar.bz2 mpv-a98fcdb7b3b147c15bd089b5a36fe3db0b0fd55a.tar.xz | |
Moving duplicated (and sometimes wrong) AM_MEDIA_TYPE related code into separate file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22323 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/com.h')
| -rw-r--r-- | loader/com.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/loader/com.h b/loader/com.h index 172ce915b5..5f8e43925d 100644 --- a/loader/com.h +++ b/loader/com.h @@ -25,9 +25,6 @@ extern "C" { #endif -void* CoTaskMemAlloc(unsigned long cb); -void CoTaskMemFree(void* cb); - #ifndef GUID_TYPE #define GUID_TYPE typedef struct @@ -77,8 +74,18 @@ struct IClassFactory struct IClassFactory_vt* vt; }; +#if !defined(__MINGW32__) +//need proper ifdef to check Co* functions availability long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter, + long dwClsContext, const GUID* riid, void** ppv); +void* CoTaskMemAlloc(unsigned long cb); +void CoTaskMemFree(void* cb); +#else +long STDCALL CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter, long dwClsContext, const GUID* riid, void** ppv); +void* STDCALL CoTaskMemAlloc(unsigned long); +void STDCALL CoTaskMemFree(void*); +#endif #ifdef __cplusplus }; |