From 5bd10cf74df979e611d69db0d5563b9d0854f884 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 15 Aug 2007 16:38:46 +0100 Subject: =?UTF-8?q?Workaround=20for=20recent=20glibc=20&=20-D=5FFORTIFY=5F?= =?UTF-8?q?SOURCE=3D2=20(defines=20open()=20as=20a=20macro).=20According?= =?UTF-8?q?=20to=20bug=201773769,=20this=20breaks=20foo->open().=20The=20f?= =?UTF-8?q?ix=20(as=20used=20in=20Ville=20Skytt=C3=A4's=20patch,=20which?= =?UTF-8?q?=20doesn't=20cover=20all=20cases)=20is=20to=20replace=20this=20?= =?UTF-8?q?with=20(foo->open)().?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch was generated using sed -i -re 's/(([[:alnum:]_]+(->|\.))+open) ?\(/(\1) (/' `grep '[>.]open \?(' include -rIl` One change (in a comment) is not committed. --- src/xine-engine/audio_out.c | 2 +- src/xine-engine/post.c | 8 ++++---- src/xine-engine/xine.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 93768224b..fb2f495d5 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -1421,7 +1421,7 @@ static int ao_change_settings(aos_t *this, uint32_t bits, uint32_t rate, int mod _("stereo not supported by driver, converting to mono.\n")); } - output_sample_rate=this->driver->open(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode); + output_sample_rate=(this->driver->open) (this->driver,bits,(this->force_rate ? this->force_rate : rate),mode); } else output_sample_rate = this->input.rate; diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c index f2e14990b..32c8f9453 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.c @@ -59,7 +59,7 @@ static void post_video_open(xine_video_port_t *port_gen, xine_stream_t *stream) _x_post_rewire(port->post); _x_post_inc_usage(port); if (port->port_lock) pthread_mutex_lock(port->port_lock); - port->original_port->open(port->original_port, stream); + (port->original_port->open) (port->original_port, stream); if (port->port_lock) pthread_mutex_unlock(port->port_lock); port->stream = stream; } @@ -196,7 +196,7 @@ static int post_video_rewire(xine_post_out_t *output_gen, void *data) { if (input_port->original_port->status(input_port->original_port, input_port->stream, &width, &height, &img_duration)) { - new_port->open(new_port, input_port->stream); + (new_port->open) (new_port, input_port->stream); input_port->original_port->close(input_port->original_port, input_port->stream); } input_port->original_port = new_port; @@ -605,7 +605,7 @@ static int post_audio_open(xine_audio_port_t *port_gen, xine_stream_t *stream, _x_post_rewire(port->post); _x_post_inc_usage(port); if (port->port_lock) pthread_mutex_lock(port->port_lock); - result = port->original_port->open(port->original_port, stream, bits, rate, mode); + result = (port->original_port->open) (port->original_port, stream, bits, rate, mode); if (port->port_lock) pthread_mutex_unlock(port->port_lock); port->stream = stream; port->bits = bits; @@ -706,7 +706,7 @@ static int post_audio_rewire(xine_post_out_t *output_gen, void *data) { if (input_port->original_port->status(input_port->original_port, input_port->stream, &bits, &rate, &mode)) { - new_port->open(new_port, input_port->stream, bits, rate, mode); + (new_port->open) (new_port, input_port->stream, bits, rate, mode); input_port->original_port->close(input_port->original_port, input_port->stream); } input_port->original_port = new_port; diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 00f1dc41c..01ca48aa2 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -519,7 +519,7 @@ static int stream_rewire_audio(xine_post_out_t *output, void *data) if (stream->audio_out->status(stream->audio_out, stream, &bits, &rate, &mode)) { /* register our stream at the new output port */ - new_port->open(new_port, stream, bits, rate, mode); + (new_port->open) (new_port, stream, bits, rate, mode); stream->audio_out->close(stream->audio_out, stream); } stream->audio_out = new_port; @@ -543,7 +543,7 @@ static int stream_rewire_video(xine_post_out_t *output, void *data) if (stream->video_out->status(stream->video_out, stream, &width, &height, &img_duration)) { /* register our stream at the new output port */ - new_port->open(new_port, stream); + (new_port->open) (new_port, stream); stream->video_out->close(stream->video_out, stream); } stream->video_out = new_port; @@ -830,7 +830,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, (stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class))); - res = stream->input_plugin->open(stream->input_plugin); + res = (stream->input_plugin->open) (stream->input_plugin); switch(res) { case 1: /* Open successfull */ free(input_source); -- cgit v1.2.3