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/xine-engine/post.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/xine-engine/post.c')
| -rw-r--r-- | src/xine-engine/post.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |