summaryrefslogtreecommitdiffstats
path: root/vidix/AsmMacros.h
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 /vidix/AsmMacros.h
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 'vidix/AsmMacros.h')
-rw-r--r--vidix/AsmMacros.h9
1 files changed, 2 insertions, 7 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__ */