# HG changeset patch # User reimar # Date 1263327649 0 # Node ID fbb33d643fe696cfae80ca7c5425fe9e86f092b1 # Parent 8ddf6f92553a0853567d335f5b56ccc09aa0fcba 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. diff -r 8ddf6f92553a -r fbb33d643fe6 vidix/AsmMacros.h --- a/vidix/AsmMacros.h Tue Jan 12 19:51:29 2010 +0000 +++ b/vidix/AsmMacros.h Tue Jan 12 20:20:49 2010 +0000 @@ -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 -# ifndef __USLC__ -# define __USLC__ -# endif -# endif -#ifndef SCO325 -# include -#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 */