diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-02 17:41:11 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-02 17:41:11 +0000 |
| commit | 12760fc513cb66f0fd39536c35a5898b6cc19498 (patch) | |
| tree | 92ef075e02539a4fe44564acedb4c7e95c1ff1b7 /loader | |
| parent | f4f37e555a0fd2041009cbf431ea9ec58203f5de (diff) | |
| download | mpv-12760fc513cb66f0fd39536c35a5898b6cc19498.tar.bz2 mpv-12760fc513cb66f0fd39536c35a5898b6cc19498.tar.xz | |
Several hacks to fix compilation of tvi_dshow on MinGW64.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/wine/basetsd.h | 4 | ||||
| -rw-r--r-- | loader/wine/winnt.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/loader/wine/basetsd.h b/loader/wine/basetsd.h index 0cc60c11e3..7a13d58dba 100644 --- a/loader/wine/basetsd.h +++ b/loader/wine/basetsd.h @@ -72,8 +72,8 @@ typedef unsigned __int64 __uint64; #if defined(_WIN64) -typedef __uint32 __ptr32; -typedef void *__ptr64; +//typedef __uint32 __ptr32; +//typedef void *__ptr64; #else /* FIXME: defined(_WIN32) */ diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index b4c8ee1573..b79b528752 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -620,7 +620,8 @@ typedef struct CONTEXT #endif /* __sparc__ */ #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) -#error You need to define a CONTEXT for your CPU +#warning You need to define a CONTEXT for your CPU +typedef void CONTEXT; #endif typedef CONTEXT *PCONTEXT; @@ -747,7 +748,7 @@ typedef HANDLE *PHANDLE; #endif /* __sparc__ */ #ifndef DEFINE_REGS_ENTRYPOINT_0 -#error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU +#warning You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU #endif #ifdef __i386__ @@ -758,7 +759,7 @@ typedef HANDLE *PHANDLE; #endif #if !defined(GET_IP) && !defined(RC_INVOKED) -# error You must define GET_IP for this CPU +#warning You must define GET_IP for this CPU #endif /* |