diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-12 20:26:15 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-12 20:26:15 +0000 |
| commit | 06c2afa7500850bcf5274f05c7bf05fc4186e8b0 (patch) | |
| tree | 5875b720d234f3c84def2f0eb919174ca665e71f | |
| parent | 0d17260656af67ac07d02c8cf464f788609c9fcb (diff) | |
| download | mpv-06c2afa7500850bcf5274f05c7bf05fc4186e8b0.tar.bz2 mpv-06c2afa7500850bcf5274f05c7bf05fc4186e8b0.tar.xz | |
Use ARCH_X86_32 instead of the compiler-specific __i386__
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30294 b3059339-0415-0410-9bf9-f77b7e298cf2
| -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) { |