Mercurial > mplayer.hg
changeset 30252:cb4e9c35fa0c
Use ARCH_X86_32 instead of the compiler-specific __i386__
| author | reimar |
|---|---|
| date | Tue, 12 Jan 2010 20:26:15 +0000 |
| parents | fbb33d643fe6 |
| children | 0fe4119d6115 |
| files | loader/wine/winnt.h |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/loader/wine/winnt.h Tue Jan 12 20:20:49 2010 +0000 +++ b/loader/wine/winnt.h Tue Jan 12 20:26:15 2010 +0000 @@ -211,7 +211,7 @@ #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 CONTEXT86 CONTEXT; -#endif /* __i386__ */ +#endif /* ARCH_X86_32 */ /* Alpha context definitions */ #if defined(_ALPHA_) || defined(__alpha__) @@ -676,7 +676,7 @@ /* 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 @@ #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 @@ #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 @@ 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) {