[MPlayer-cvslog] r27282 - in trunk: stream/vcd_read.h vidix/mtrr.c vidix/pci.c vidix/sysdep/AsmMacros_alpha.h vidix/sysdep/AsmMacros_ia64.h

[michael]

Author: michael
Date: Tue Jul 15 02:21:32 2008
New Revision: 27282

Log:
Remove -std=gnu99 dialect linux define.


Modified:
   trunk/stream/vcd_read.h
   trunk/vidix/mtrr.c
   trunk/vidix/pci.c
   trunk/vidix/sysdep/AsmMacros_alpha.h
   trunk/vidix/sysdep/AsmMacros_ia64.h

Modified: trunk/stream/vcd_read.h
==============================================================================
--- trunk/stream/vcd_read.h	(original)
+++ trunk/stream/vcd_read.h	Tue Jul 15 02:21:32 2008
@@ -9,11 +9,11 @@
 #include "stream.h"
 #include "libavutil/intreadwrite.h"
 //=================== VideoCD ==========================
-#if	defined(linux) || defined(sun) || defined(__bsdi__)
+#if	defined(__linux__) || defined(sun) || defined(__bsdi__)
 
 typedef struct mp_vcd_priv_st mp_vcd_priv_t;
 
-#if	defined(linux)
+#if	defined(__linux__)
 #include <linux/cdrom.h>
 #elif	defined(sun)
 #include <sys/cdio.h>
@@ -128,7 +128,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
 }
 
 static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
-#if	defined(linux) || defined(__bsdi__)
+#if	defined(__linux__) || defined(__bsdi__)
   memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf));
   if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF?
   memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
@@ -225,7 +225,7 @@ static int sun_vcd_read(mp_vcd_priv_t* v
 }
 #endif	/*sun*/
 
-#else /* linux || sun || __bsdi__ */
+#else /* __linux__ || sun || __bsdi__ */
 
 #error vcd is not yet supported on this arch...
 

Modified: trunk/vidix/mtrr.c
==============================================================================
--- trunk/vidix/mtrr.c	(original)
+++ trunk/vidix/mtrr.c	Tue Jul 15 02:21:32 2008
@@ -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)

Modified: trunk/vidix/pci.c
==============================================================================
--- trunk/vidix/pci.c	(original)
+++ trunk/vidix/pci.c	Tue Jul 15 02:21:32 2008
@@ -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"

Modified: trunk/vidix/sysdep/AsmMacros_alpha.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_alpha.h	(original)
+++ trunk/vidix/sysdep/AsmMacros_alpha.h	Tue Jul 15 02:21:32 2008
@@ -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>

Modified: trunk/vidix/sysdep/AsmMacros_ia64.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_ia64.h	(original)
+++ trunk/vidix/sysdep/AsmMacros_ia64.h	Tue Jul 15 02:21:32 2008
@@ -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