Mercurial > mplayer.hg

changeset 31014:a6268840b870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge iopl()-related #ifdefs.
author diego
date Thu, 22 Apr 2010 13:53:13 +0000
parents e117bd87b33c
children 448f9d88d367
files vidix/sysdep/pci_linux.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/vidix/sysdep/pci_linux.c	Thu Apr 22 13:50:25 2010 +0000
+++ b/vidix/sysdep/pci_linux.c	Thu Apr 22 13:53:13 2010 +0000
@@ -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