diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-21 15:03:49 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-21 15:03:49 +0300 |
| commit | 2d4656e070697cebe8cb66568b3e8dd8919b5eed (patch) | |
| tree | 39c927d18e0ab459c7ddf36dcb876d2d0621e2a6 /vidix | |
| parent | 92f0cba26b5c032f8b097f525862233d92a02a2d (diff) | |
| parent | 4993d0c46afa109c3deb8d818be712ec86e0230a (diff) | |
| download | mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.bz2 mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.xz | |
Merge svn changes up to r27332
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/mtrr.c | 2 | ||||
| -rw-r--r-- | vidix/pci.c | 2 | ||||
| -rw-r--r-- | vidix/sysdep/AsmMacros_alpha.h | 2 | ||||
| -rw-r--r-- | vidix/sysdep/AsmMacros_ia64.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vidix/mtrr.c b/vidix/mtrr.c index bda566f68e..775af9e437 100644 --- a/vidix/mtrr.c +++ b/vidix/mtrr.c @@ -39,7 +39,7 @@ int mtrr_set_type(unsigned base,unsigned size,int type) { -#ifdef linux +#ifdef __linux__ FILE * mtrr_fd; char * stype; switch(type) diff --git a/vidix/pci.c b/vidix/pci.c index 1d0cc5aa01..ffa91224e1 100644 --- a/vidix/pci.c +++ b/vidix/pci.c @@ -61,7 +61,7 @@ #endif #include "AsmMacros.h" /* OS depended stuff */ -#if defined (linux) +#if defined (__linux__) #include "sysdep/pci_linux.c" #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) #include "sysdep/pci_freebsd.c" diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h index e2e3751629..2cc8d01544 100644 --- a/vidix/sysdep/AsmMacros_alpha.h +++ b/vidix/sysdep/AsmMacros_alpha.h @@ -62,7 +62,7 @@ #ifndef MPLAYER_ASMMACROS_ALPHA_H #define MPLAYER_ASMMACROS_ALPHA_H -#if defined (linux) +#if defined (__linux__) #include <sys/io.h> #elif defined (__FreeBSD__) #include <sys/types.h> diff --git a/vidix/sysdep/AsmMacros_ia64.h b/vidix/sysdep/AsmMacros_ia64.h index 0e2dc19024..b25cfee4e5 100644 --- a/vidix/sysdep/AsmMacros_ia64.h +++ b/vidix/sysdep/AsmMacros_ia64.h @@ -62,7 +62,7 @@ #ifndef MPLAYER_ASMMACROS_IA64_H #define MPLAYER_ASMMACROS_IA64_H -#if defined(linux) +#if defined(__linux__) #include <sys/io.h> #else #error This stuff is not ported on your system |