From 0589f4723951f891c9d7e47dd9e10bfaf6e16f4e Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 15 Jul 2008 00:21:32 +0000 Subject: 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 --- stream/vcd_read.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'stream') 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 #elif defined(sun) #include @@ -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... -- cgit v1.2.3 From 803385a5d71aec6a44afc9a6b9409eb5ed48722d Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 15 Jul 2008 17:35:52 +0000 Subject: Replace S_IREAD|S_IWRITE by POSIX-compatible S_IRUSR|S_IWUSR (not exactly the same, but should not matter). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27289 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_cddb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream') diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 2f177eb7bd..ff12d94c17 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -390,7 +390,7 @@ cddb_write_cache(cddb_data_t *cddb_data) { sprintf( file_name, "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id ); - file_fd = creat(file_name, S_IREAD|S_IWRITE); + file_fd = creat(file_name, S_IRUSR|S_IWUSR); if( file_fd<0 ) { perror("create"); return -1; -- cgit v1.2.3 From 6dfb85dc9ec79ec10e073e317566cfc0fbffb319 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 17 Jul 2008 17:11:30 +0000 Subject: Our ALSA code needs alloca, so check for it in configure and include alloca.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/ai_alsa.c | 1 + stream/ai_alsa1x.c | 1 + 2 files changed, 2 insertions(+) (limited to 'stream') diff --git a/stream/ai_alsa.c b/stream/ai_alsa.c index a1468bed09..84d0aa58a4 100644 --- a/stream/ai_alsa.c +++ b/stream/ai_alsa.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "config.h" diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 455c64191f..aab42e397b 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "config.h" -- cgit v1.2.3