diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:22:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:23:32 +0300 |
| commit | f38efd166e43f5cae783f38f9913d2859557143e (patch) | |
| tree | 38f49af429d4147e390f0b52384294b2e35b9d6f /vidix | |
| parent | 7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff) | |
| parent | 4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff) | |
| download | mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2 mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz | |
Merge svn changes up to r31097
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/sysdep/pci_linux.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c index 62ccc9bd93..4d0f7d640a 100644 --- a/vidix/sysdep/pci_linux.c +++ b/vidix/sysdep/pci_linux.c @@ -30,16 +30,14 @@ #ifdef __i386__ //#include <sys/perm.h> doesn't exist on libc5 systems int iopl(); +#elif defined(__sh__) +#define iopl(x) 1 #else -#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__x86_64__) && !defined(__sh__) +#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__x86_64__) #include <sys/io.h> #endif #endif -#ifdef __sh__ -#define iopl(x) 1 -#endif - #include "config.h" #ifdef CONFIG_DHAHELPER @@ -50,9 +48,7 @@ int dhahelper_fd = 0; #ifdef CONFIG_SVGAHELPER #include <svgalib_helper.h> -#ifdef __linux__ #include <linux/ioctl.h> -#endif #include <fcntl.h> #ifndef SVGALIB_HELPER_IOC_MAGIC /* svgalib 1.9.18+ compatibility ::atmos */ |