summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 18:59:27 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 18:59:27 +0000
commit6b52a2e974ba3c3065d13a16cc2fa69f96745d0d (patch)
treedac114864d767dcc442978838b4b3449af30010b /loader
parent629db77d89d6bdead91fd18faa6445632a750e94 (diff)
downloadmpv-6b52a2e974ba3c3065d13a16cc2fa69f96745d0d.tar.bz2
mpv-6b52a2e974ba3c3065d13a16cc2fa69f96745d0d.tar.xz
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/win32.c2
-rw-r--r--loader/wine/winnt.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/loader/win32.c b/loader/win32.c
index 13f880c137..b3b157bb5d 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -4569,7 +4569,7 @@ static INT WINAPI expMessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type
void exp_EH_prolog(void *dest);
//! just a dummy function that acts a container for the asm section
void exp_EH_prolog_dummy(void) {
- asm volatile (
+ __asm__ volatile (
// take care, this "function" may not change flags or
// registers besides eax (which is also why we can't use
// exp_EH_prolog_dummy directly)
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" \