diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-15 00:21:32 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-15 00:21:32 +0000 |
| commit | 0589f4723951f891c9d7e47dd9e10bfaf6e16f4e (patch) | |
| tree | ab8336f96843d2654e71f43ac80000d03f559b94 /stream | |
| parent | cf8d38125537f2b77d2321e7d19d5957bab56669 (diff) | |
| download | mpv-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 'stream')
| -rw-r--r-- | stream/vcd_read.h | 8 |
1 files changed, 4 insertions, 4 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... |