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/post/visualizations/oscope.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/post/visualizations/oscope.c') diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 483fc39ab..2c3e7dd45 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -164,7 +164,7 @@ static int oscope_rewire_video(xine_post_out_t *output_gen, void *data) if (!data) return 0; old_port->close(old_port, XINE_ANON_STREAM); - new_port->open(new_port, XINE_ANON_STREAM); + (new_port->open) (new_port, XINE_ANON_STREAM); /* reconnect ourselves */ this->vo_port = new_port; return 1; @@ -194,10 +194,10 @@ static int oscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, this->sample_counter = 0; init_yuv_planes(&this->yuv, OSCOPE_WIDTH, OSCOPE_HEIGHT); - this->vo_port->open(this->vo_port, XINE_ANON_STREAM); + (this->vo_port->open) (this->vo_port, XINE_ANON_STREAM); this->metronom->set_master(this->metronom, stream->metronom); - return port->original_port->open(port->original_port, stream, bits, rate, mode ); + return (port->original_port->open) (port->original_port, stream, bits, rate, mode ); } static void oscope_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { -- cgit v1.2.3