Compile fixes for Linux ARM platforms.

This commit is contained in:
Lennart Buytenhek 2007-06-18 12:05:55 -04:00 committed by Adam Jackson
parent 562ca3f2f9
commit 831d3b7f8d
3 changed files with 6 additions and 4 deletions

View File

@ -3004,7 +3004,7 @@ xf86FindPrimaryDevice()
} }
#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) #if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__)
#include "vgaHW.h" #include "vgaHW.h"
#include "compiler.h" #include "compiler.h"
#endif #endif

View File

@ -62,7 +62,8 @@ static Bool ExtendedEnabled = FALSE;
#elif !defined(__powerpc__) && \ #elif !defined(__powerpc__) && \
!defined(__mc68000__) && \ !defined(__mc68000__) && \
!defined(__sparc__) && \ !defined(__sparc__) && \
!defined(__mips__) !defined(__mips__) && \
!defined(__arm__)
/* /*
* Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
@ -567,7 +568,7 @@ xf86EnableIO(void)
#endif #endif
} }
close(fd); close(fd);
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
if (ioperm(0, 1024, 1) || iopl(3)) { if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV) if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n"); ErrorF("xf86EnableIOPorts: no I/O ports found\n");

View File

@ -35,7 +35,8 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
#if !defined(__sparc__) && \ #if !defined(__sparc__) && \
!defined(__powerpc__) && \ !defined(__powerpc__) && \
!defined(__mips__) && \ !defined(__mips__) && \
!defined(__ia64__) !defined(__ia64__) && \
!defined(__arm__)
outb(0x80, 0x00); outb(0x80, 0x00);
#endif #endif
} }