diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-16 18:59:27 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-16 18:59:27 +0000 |
| commit | 6b52a2e974ba3c3065d13a16cc2fa69f96745d0d (patch) | |
| tree | dac114864d767dcc442978838b4b3449af30010b /vidix | |
| parent | 629db77d89d6bdead91fd18faa6445632a750e94 (diff) | |
| download | mpv-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 'vidix')
| -rw-r--r-- | vidix/AsmMacros.h | 9 | ||||
| -rw-r--r-- | vidix/sysdep/pci_os2.c | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/vidix/AsmMacros.h b/vidix/AsmMacros.h index f40929ade5..c202fd4cec 100644 --- a/vidix/AsmMacros.h +++ b/vidix/AsmMacros.h @@ -99,11 +99,6 @@ void outl(U16_t, U32_t); #else /* not _MINIX and _ACK */ -# if defined(__STDC__) && (__STDC__ == 1) -# ifndef NCR -# define asm __asm -# endif -# endif # ifdef SVR4 # include <sys/types.h> # ifndef __USLC__ @@ -115,8 +110,8 @@ void outl(U16_t, U32_t); #else # include "../common/scoasm.h" #endif -#define intr_disable() asm("cli") -#define intr_enable() asm("sti") +#define intr_disable() __asm__("cli") +#define intr_enable() __asm__("sti") #endif /* _MINIX and _ACK */ #endif /* __GNUC__ */ diff --git a/vidix/sysdep/pci_os2.c b/vidix/sysdep/pci_os2.c index 002494f682..5e19463820 100644 --- a/vidix/sysdep/pci_os2.c +++ b/vidix/sysdep/pci_os2.c @@ -62,7 +62,7 @@ static __inline__ int enable_os_io(void) /* Calling callgate with function 13 sets IOPL for the program */ - asm volatile ("movl $13,%%ebx;.byte 0xff,0x1d;.long _callgate" + __asm__ volatile ("movl $13,%%ebx;.byte 0xff,0x1d;.long _callgate" : /*no outputs */ : /*no inputs */ : "eax","ebx","ecx","edx","cc"); |