diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:17:56 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:17:56 +0200 |
| commit | d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec (patch) | |
| tree | bfcdec92ef691c472bb71a896ccb5ee1d7e29129 /loader | |
| parent | dd0bab9239fb1be1df856205d6a5c085910e0ae8 (diff) | |
| parent | 1d3fd9e1ea720c23076268cb69fa2c4245dd9109 (diff) | |
| download | mpv-d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec.tar.bz2 mpv-d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec.tar.xz | |
Merge svn changes up to r30173
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 /* |