diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /loader/wine/winnt.h | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'loader/wine/winnt.h')
-rw-r--r-- | loader/wine/winnt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index cbe06f6976..19594e71b1 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -693,7 +693,7 @@ typedef HANDLE *PHANDLE; #else /* __GNUC__ */ # define ASM_GLOBAL_FUNC(name,code) \ void asm_dummy_##name(void) { \ - asm( ".align 4\n\t" \ + __asm__( ".align 4\n\t" \ ".globl " ASM_NAME(#name) "\n\t" \ ".type " ASM_NAME(#name) ",@function\n" \ ASM_NAME(#name) ":\n\t" \ |