[MPlayer-cvslog] r31056 - trunk/vidix/sysdep/pci_linux.c

diego subversion at mplayerhq.hu
Thu Apr 22 15:53:13 CEST 2010


Author: diego
Date: Thu Apr 22 15:53:13 2010
New Revision: 31056

Log:
Merge iopl()-related #ifdefs.

Modified:
   trunk/vidix/sysdep/pci_linux.c

Modified: trunk/vidix/sysdep/pci_linux.c
==============================================================================
--- trunk/vidix/sysdep/pci_linux.c	Thu Apr 22 15:50:25 2010	(r31055)
+++ trunk/vidix/sysdep/pci_linux.c	Thu Apr 22 15:53:13 2010	(r31056)
@@ -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


More information about the MPlayer-cvslog mailing list