Mercurial > mplayer.hg
changeset 27250:dcf62171257b
Remove -std=gnu99/gnu89/default dialect linux define, as it violates the
C standard.
| author | michael |
|---|---|
| date | Tue, 15 Jul 2008 00:21:32 +0000 |
| parents | 4be2b34aa431 |
| children | 93503c403d56 |
| files | stream/vcd_read.h vidix/mtrr.c vidix/pci.c vidix/sysdep/AsmMacros_alpha.h vidix/sysdep/AsmMacros_ia64.h |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/vcd_read.h Mon Jul 14 16:38:58 2008 +0000 +++ b/stream/vcd_read.h Tue Jul 15 00:21:32 2008 +0000 @@ -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 @@ } 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 @@ } #endif /*sun*/ -#else /* linux || sun || __bsdi__ */ +#else /* __linux__ || sun || __bsdi__ */ #error vcd is not yet supported on this arch...
--- a/vidix/mtrr.c Mon Jul 14 16:38:58 2008 +0000 +++ b/vidix/mtrr.c Tue Jul 15 00:21:32 2008 +0000 @@ -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)
--- a/vidix/pci.c Mon Jul 14 16:38:58 2008 +0000 +++ b/vidix/pci.c Tue Jul 15 00:21:32 2008 +0000 @@ -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"
--- a/vidix/sysdep/AsmMacros_alpha.h Mon Jul 14 16:38:58 2008 +0000 +++ b/vidix/sysdep/AsmMacros_alpha.h Tue Jul 15 00:21:32 2008 +0000 @@ -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>
--- a/vidix/sysdep/AsmMacros_ia64.h Mon Jul 14 16:38:58 2008 +0000 +++ b/vidix/sysdep/AsmMacros_ia64.h Tue Jul 15 00:21:32 2008 +0000 @@ -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