summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-22 13:53:13 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-22 13:53:13 +0000
commit02afa9baf44eec0e99e9d377f3ae9371d91563c5 (patch)
tree6e45b5d07d8baff85b737b7eff9bb9c61750ffb3 /vidix
parentb1767fc45e1b1751558e61ab1cbad7d62bcd4b5d (diff)
downloadmpv-02afa9baf44eec0e99e9d377f3ae9371d91563c5.tar.bz2
mpv-02afa9baf44eec0e99e9d377f3ae9371d91563c5.tar.xz
Merge iopl()-related #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31056 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/sysdep/pci_linux.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c
index e54fb99546..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