From 7cad1e99513584d3690c847ed451d443ae4ec1cf Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 26 Jun 2004 12:40:56 +0000
Subject: [PATCH] x86-64 (amd64) support by Kenny Root

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12688 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libdha/pci.c                 | 2 ++
 libdha/sysdep/pci_linux.c    | 6 +++---
 libmpcodecs/native/RTjpegN.h | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libdha/pci.c b/libdha/pci.c
index 8d43d6c0ae..9524d8a2c0 100644
--- a/libdha/pci.c
+++ b/libdha/pci.c
@@ -492,6 +492,8 @@ static int pcibus=-1, pcicard=-1, pcifunc=-1 ;
 #include "sysdep/pci_arm32.c"
 #elif defined(__powerpc__)
 #include "sysdep/pci_powerpc.c"
+#elif defined(__x86_64__)
+/* Nothing here right now */
 #else
 #include "sysdep/pci_x86.c"
 #endif
diff --git a/libdha/sysdep/pci_linux.c b/libdha/sysdep/pci_linux.c
index 7d27fc073f..3dbc592c0d 100644
--- a/libdha/sysdep/pci_linux.c
+++ b/libdha/sysdep/pci_linux.c
@@ -7,7 +7,7 @@
 #ifdef __i386__
 // is this needed? #include <sys/perm.h>
 #else
-#if !defined(__sparc__) && !defined(__powerpc__)
+#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__x86_64__)
 #include <sys/io.h>
 #endif
 #endif
@@ -117,8 +117,8 @@ static __inline__ int disable_os_io(void)
     return(0);
 }
 
-#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)) \
-    && defined(__linux__) && !defined(CONFIG_SVGAHELPER)
+#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \
+    || defined(__x86_64__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER)
 #define CONFIG_PCI_LINUX_PROC
 #endif
 
diff --git a/libmpcodecs/native/RTjpegN.h b/libmpcodecs/native/RTjpegN.h
index 2f63162365..1de1322c36 100644
--- a/libmpcodecs/native/RTjpegN.h
+++ b/libmpcodecs/native/RTjpegN.h
@@ -22,7 +22,7 @@
     
 */
 
-#ifndef _I386_TYPES_H
+#if !defined(_I386_TYPES_H) && !defined(_X86_64_TYPES_H)
 typedef unsigned char __u8;
 typedef unsigned short __u16;
 typedef unsigned long __u32;