diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:04:07 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:07:30 +0200 |
| commit | 69fe2522f8c2a04eda112eee6319ca2e85d7038b (patch) | |
| tree | 83a8b19997e621309344ca1f3997a48886ef0944 /vidix | |
| parent | 9436e0452fad48e671d7320cb18c588655f3d230 (diff) | |
| parent | 1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff) | |
| download | mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.bz2 mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.xz | |
Merge svn changes up to r30301
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/AsmMacros.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/vidix/AsmMacros.h b/vidix/AsmMacros.h index da4e3b150b..e798770ebe 100644 --- a/vidix/AsmMacros.h +++ b/vidix/AsmMacros.h @@ -66,7 +66,6 @@ #ifndef MPLAYER_ASMMACROS_H #define MPLAYER_ASMMACROS_H -#if defined(__GNUC__) #if defined(__alpha__) #include "sysdep/AsmMacros_alpha.h" #elif defined(__ia64__) @@ -81,37 +80,4 @@ #include "sysdep/AsmMacros_x86.h" #endif -#else /* __GNUC__ */ - -#if defined(_MINIX) && defined(_ACK) - -/* inb, outb, inw and outw are defined in the library */ -/* ... but I've no idea if the same is true for inl & outl */ - -u8_t inb(U16_t); -void outb(U16_t, U8_t); -u16_t inw(U16_t); -void outw(U16_t, U16_t); -u32_t inl(U16_t); -void outl(U16_t, U32_t); - -#else /* not _MINIX and _ACK */ - -# ifdef SVR4 -# include <sys/types.h> -# ifndef __USLC__ -# define __USLC__ -# endif -# endif -#ifndef SCO325 -# include <sys/inline.h> -#else -# include "../common/scoasm.h" -#endif -#define intr_disable() __asm__("cli") -#define intr_enable() __asm__("sti") - -#endif /* _MINIX and _ACK */ -#endif /* __GNUC__ */ - #endif /* MPLAYER_ASMMACROS_H */ |