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/audio | |
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/audio')
-rw-r--r-- | src/post/audio/stretch.c | 2 | ||||
-rw-r--r-- | src/post/audio/upmix.c | 2 | ||||
-rw-r--r-- | src/post/audio/upmix_mono.c | 2 | ||||
-rw-r--r-- | src/post/audio/volnorm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 054468517..33fd4b7ce 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -307,7 +307,7 @@ static int stretch_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, /* force updating on stretch_port_put_buffer */ this->params_changed = 1; - 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 stretch_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 975d8b79e..bc8cb8025 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -203,7 +203,7 @@ static int upmix_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, pthread_mutex_unlock (&this->lock); - return port->original_port->open(port->original_port, stream, bits, rate, mode ); + return (port->original_port->open) (port->original_port, stream, bits, rate, mode ); } #if 0 diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index ddb52b018..5a8ea9abb 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -159,7 +159,7 @@ static int upmix_mono_port_open(xine_audio_port_t *port_gen, xine_stream_t *stre } } - 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 upmix_mono_port_put_buffer(xine_audio_port_t *port_gen, diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index 9bddf6087..9278db6a9 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -184,7 +184,7 @@ static int volnorm_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, port->rate = rate; port->mode = mode; - 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 volnorm_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { |