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