Mercurial > mplayer.hg
changeset 12687:cb35163ef0a1
x86-64 (amd64) support by Kenny Root
| author | alex |
|---|---|
| date | Sat, 26 Jun 2004 12:40:56 +0000 |
| parents | cc5aa27a50ff |
| children | 494d8a2a29d0 |
| files | libdha/pci.c libdha/sysdep/pci_linux.c libmpcodecs/native/RTjpegN.h |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libdha/pci.c Sat Jun 26 12:35:35 2004 +0000 +++ b/libdha/pci.c Sat Jun 26 12:40:56 2004 +0000 @@ -492,6 +492,8 @@ #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
--- a/libdha/sysdep/pci_linux.c Sat Jun 26 12:35:35 2004 +0000 +++ b/libdha/sysdep/pci_linux.c Sat Jun 26 12:40:56 2004 +0000 @@ -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 @@ 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
--- a/libmpcodecs/native/RTjpegN.h Sat Jun 26 12:35:35 2004 +0000 +++ b/libmpcodecs/native/RTjpegN.h Sat Jun 26 12:40:56 2004 +0000 @@ -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;