diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-15 16:38:46 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-15 16:38:46 +0100 |
commit | 5bd10cf74df979e611d69db0d5563b9d0854f884 (patch) | |
tree | 9f325c495b00bac763af0301e8355f4f252b0e26 /src/post/visualizations/oscope.c | |
parent | 7047d9e5acf97c91a523c99ccc4b008a35a3e094 (diff) | |
download | xine-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/post/visualizations/oscope.c')
-rw-r--r-- | src/post/visualizations/oscope.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 ) { |