diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-12 20:20:49 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-12 20:20:49 +0000 |
| commit | 0d17260656af67ac07d02c8cf464f788609c9fcb (patch) | |
| tree | f99d9678572563cd7c4a1530e790c62627e76823 | |
| parent | c69a27ef8eccb79c4c85ba966de59ee00d47e844 (diff) | |
| download | mpv-0d17260656af67ac07d02c8cf464f788609c9fcb.tar.bz2 mpv-0d17260656af67ac07d02c8cf464f788609c9fcb.tar.xz | |
Remove hackish and not actually working code to make vidix compile with
compilers without inline assembly.
Almost no OS provides inb() etc. in its libraries, and removing the
broken fallback code makes it compile on Solaris with Sun C compiler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30293 b3059339-0415-0410-9bf9-f77b7e298cf2
| -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 */ |