RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2010-01-12 20:26:15 +00:00
parent 0d17260656
commit 06c2afa750
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
loader/wine/winnt.h
View File

@ -211,7 +211,7 @@ typedef struct CONTEXT86
#define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS)
/* i386 context definitions */ /* i386 context definitions */
#ifdef __i386__ #if ARCH_X86_32
#define CONTEXT_CONTROL CONTEXT86_CONTROL #define CONTEXT_CONTROL CONTEXT86_CONTROL
#define CONTEXT_INTEGER CONTEXT86_INTEGER #define CONTEXT_INTEGER CONTEXT86_INTEGER
@ -222,7 +222,7 @@ typedef struct CONTEXT86
typedef CONTEXT86 CONTEXT; typedef CONTEXT86 CONTEXT;
#endif /* __i386__ */ #endif /* ARCH_X86_32 */
/* Alpha context definitions */ /* Alpha context definitions */
#if defined(_ALPHA_) || defined(__alpha__) #if defined(_ALPHA_) || defined(__alpha__)
@ -676,7 +676,7 @@ typedef HANDLE *PHANDLE;
/* Macros to retrieve the current context */ /* Macros to retrieve the current context */
#ifdef __i386__ #if ARCH_X86_32
#ifdef NEED_UNDERSCORE_PREFIX #ifdef NEED_UNDERSCORE_PREFIX
# define ASM_NAME(name) "_" name # define ASM_NAME(name) "_" name
@ -718,7 +718,7 @@ typedef HANDLE *PHANDLE;
#define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \ #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \
DEFINE_REGS_ENTRYPOINT( name, fn, 16 ) DEFINE_REGS_ENTRYPOINT( name, fn, 16 )
#endif /* __i386__ */ #endif /* ARCH_X86_32 */
#ifdef __sparc__ #ifdef __sparc__
/* FIXME: use getcontext() to retrieve full context */ /* 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 #warning You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU
#endif #endif
#ifdef __i386__ #if ARCH_X86_32
# define GET_IP(context) ((LPVOID)(context)->Eip) # define GET_IP(context) ((LPVOID)(context)->Eip)
#endif #endif
#ifdef __sparc__ #ifdef __sparc__
@ -1071,7 +1071,7 @@ typedef struct NT_TIB
struct TEB; 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);
inline struct TEB * WINAPI NtCurrentTeb(void) inline struct TEB * WINAPI NtCurrentTeb(void)
{ {