summaryrefslogtreecommitdiff
path: root/src/libw32dll/w32codec.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-08-15 16:38:46 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-08-15 16:38:46 +0100
commit5bd10cf74df979e611d69db0d5563b9d0854f884 (patch)
tree9f325c495b00bac763af0301e8355f4f252b0e26 /src/libw32dll/w32codec.c
parent7047d9e5acf97c91a523c99ccc4b008a35a3e094 (diff)
downloadxine-lib-5bd10cf74df979e611d69db0d5563b9d0854f884.tar.gz
xine-lib-5bd10cf74df979e611d69db0d5563b9d0854f884.tar.bz2
Workaround for recent glibc & -D_FORTIFY_SOURCE=2 (defines open() as a macro).
According to bug 1773769, this breaks foo->open(). The fix (as used in Ville Skyttä's patch, which doesn't cover all cases) is to replace this with (foo->open)(). This patch was generated using sed -i -re 's/(([[:alnum:]_]+(->|\.))+open) ?\(/(\1) (/' `grep '[>.]open \?(' include -rIl` One change (in a comment) is not committed.
Diffstat (limited to 'src/libw32dll/w32codec.c')
-rw-r--r--src/libw32dll/w32codec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 99509372e..02cad2d1f 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -657,7 +657,7 @@ static void w32v_init_codec (w32v_decoder_t *this, int buf_type) {
this->bufsize = VIDEOBUFSIZE;
this->buf = malloc(this->bufsize);
- this->stream->video_out->open (this->stream->video_out, this->stream);
+ (this->stream->video_out->open) (this->stream->video_out, this->stream);
this->outfmt = outfmt;
this->decoder_ok = 1;
@@ -752,7 +752,7 @@ static void w32v_init_ds_dmo_codec (w32v_decoder_t *this, int buf_type) {
this->bufsize = VIDEOBUFSIZE;
this->buf = malloc(this->bufsize);
- this->stream->video_out->open (this->stream->video_out, this->stream);
+ (this->stream->video_out->open) (this->stream->video_out, this->stream);
this->outfmt = outfmt;
this->decoder_ok = 1;
@@ -1181,7 +1181,7 @@ static int w32a_init_audio (w32a_decoder_t *this,
if (this->output_open)
this->stream->audio_out->close (this->stream->audio_out, this->stream);
- this->output_open = this->stream->audio_out->open( this->stream->audio_out, this->stream,
+ this->output_open = (this->stream->audio_out->open) ( this->stream->audio_out, this->stream,
16, in_fmt->nSamplesPerSec,
_x_ao_channels2mode(in_fmt->nChannels));
if (!this->output_open) {