diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:04:07 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:07:30 +0200 |
| commit | 69fe2522f8c2a04eda112eee6319ca2e85d7038b (patch) | |
| tree | 83a8b19997e621309344ca1f3997a48886ef0944 /loader | |
| parent | 9436e0452fad48e671d7320cb18c588655f3d230 (diff) | |
| parent | 1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff) | |
| download | mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.bz2 mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.xz | |
Merge svn changes up to r30301
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/wine/winnt.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index b79b528752..cb9984a1c4 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -211,7 +211,7 @@ typedef struct CONTEXT86 #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) /* i386 context definitions */ -#ifdef __i386__ +#if ARCH_X86_32 #define CONTEXT_CONTROL CONTEXT86_CONTROL #define CONTEXT_INTEGER CONTEXT86_INTEGER @@ -222,7 +222,7 @@ typedef struct CONTEXT86 typedef CONTEXT86 CONTEXT; -#endif /* __i386__ */ +#endif /* ARCH_X86_32 */ /* Alpha context definitions */ #if defined(_ALPHA_) || defined(__alpha__) @@ -676,7 +676,7 @@ typedef HANDLE *PHANDLE; /* Macros to retrieve the current context */ -#ifdef __i386__ +#if ARCH_X86_32 #ifdef NEED_UNDERSCORE_PREFIX # define ASM_NAME(name) "_" name @@ -718,7 +718,7 @@ typedef HANDLE *PHANDLE; #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \ DEFINE_REGS_ENTRYPOINT( name, fn, 16 ) -#endif /* __i386__ */ +#endif /* ARCH_X86_32 */ #ifdef __sparc__ /* FIXME: use getcontext() to retrieve full context */ @@ -751,7 +751,7 @@ typedef HANDLE *PHANDLE; #warning You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU #endif -#ifdef __i386__ +#if ARCH_X86_32 # define GET_IP(context) ((LPVOID)(context)->Eip) #endif #ifdef __sparc__ @@ -1071,7 +1071,7 @@ typedef struct NT_TIB struct TEB; /* -#if defined(__i386__) && defined(__GNUC__) +#if ARCH_X86_32 && defined(__GNUC__) inline struct TEB * WINAPI NtCurrentTeb(void); inline struct TEB * WINAPI NtCurrentTeb(void) { |