diff options
| -rw-r--r-- | stream/vcd_read.h | 8 | ||||
| -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 |
5 files changed, 8 insertions, 8 deletions
diff --git a/stream/vcd_read.h b/stream/vcd_read.h index 9cf46fce25..177316ecae 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -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* vcd, int *offset) } #endif /*sun*/ -#else /* linux || sun || __bsdi__ */ +#else /* __linux__ || sun || __bsdi__ */ #error vcd is not yet supported on this arch... 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 |