diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /loader/wine/winnt.h | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'loader/wine/winnt.h')
| -rw-r--r-- | loader/wine/winnt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index 19594e71b1..dd0f0b05c5 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -1071,15 +1071,15 @@ typedef struct NT_TIB struct TEB; /* #if defined(__i386__) && defined(__GNUC__) -extern inline struct TEB * WINAPI NtCurrentTeb(void); -extern inline struct TEB * WINAPI NtCurrentTeb(void) +inline struct TEB * WINAPI NtCurrentTeb(void); +inline struct TEB * WINAPI NtCurrentTeb(void) { struct TEB *teb; __asm__(".byte 0x64\n\tmovl (0x18),%0" : "=r" (teb)); return teb; } #else -extern struct TEB * WINAPI NtCurrentTeb(void); +struct TEB * WINAPI NtCurrentTeb(void); #endif */ |