summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-15 00:21:32 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-15 00:21:32 +0000
commit0589f4723951f891c9d7e47dd9e10bfaf6e16f4e (patch)
treeab8336f96843d2654e71f43ac80000d03f559b94 /vidix
parentcf8d38125537f2b77d2321e7d19d5957bab56669 (diff)
downloadmpv-0589f4723951f891c9d7e47dd9e10bfaf6e16f4e.tar.bz2
mpv-0589f4723951f891c9d7e47dd9e10bfaf6e16f4e.tar.xz
Remove -std=gnu99/gnu89/default dialect linux define, as it violates the
C standard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/mtrr.c2
-rw-r--r--vidix/pci.c2
-rw-r--r--vidix/sysdep/AsmMacros_alpha.h2
-rw-r--r--vidix/sysdep/AsmMacros_ia64.h2
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