summaryrefslogtreecommitdiff
path: root/src/libxineadec
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-08-15 16:38:46 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-08-15 16:38:46 +0100
commit5bd10cf74df979e611d69db0d5563b9d0854f884 (patch)
tree9f325c495b00bac763af0301e8355f4f252b0e26 /src/libxineadec
parent7047d9e5acf97c91a523c99ccc4b008a35a3e094 (diff)
downloadxine-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/libxineadec')
-rw-r--r--src/libxineadec/fooaudio.c2
-rw-r--r--src/libxineadec/gsm610.c2
-rw-r--r--src/libxineadec/nsf.c2
-rw-r--r--src/libxineadec/xine_lpcm_decoder.c4
-rw-r--r--src/libxineadec/xine_speex_decoder.c2
-rw-r--r--src/libxineadec/xine_vorbis_decoder.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index be2903dd0..33beb3104 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -110,7 +110,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
/* if the audio output is not open yet, open the audio output */
#warning: Audio output is hardcoded to mono 16-bit PCM
if (!this->output_open) {
- this->output_open = this->stream->audio_out->open(
+ this->output_open = (this->stream->audio_out->open) (
this->stream->audio_out,
this->stream,
/* this->bits_per_sample, */
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index 4f54714c9..700d1ee4d 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -119,7 +119,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->gsm_state = gsm_create();
this->buf_type = buf->type;
- this->output_open = this->stream->audio_out->open(this->stream->audio_out,
+ this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
this->stream, GSM610_SAMPLE_SIZE, this->sample_rate, AO_CAP_MODE_MONO);
}
diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c
index 08a4f1814..31d3b36e8 100644
--- a/src/libxineadec/nsf.c
+++ b/src/libxineadec/nsf.c
@@ -127,7 +127,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
/* if the audio output is not open yet, open the audio output */
if (!this->output_open) {
- this->output_open = this->stream->audio_out->open(
+ this->output_open = (this->stream->audio_out->open) (
this->stream->audio_out,
this->stream,
this->bits_per_sample,
diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c
index 43bea4cbf..de9585849 100644
--- a/src/libxineadec/xine_lpcm_decoder.c
+++ b/src/libxineadec/xine_lpcm_decoder.c
@@ -134,12 +134,12 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
/* force 24-bit samples into 16 bits for now */
if (this->bits_per_sample == 24)
- this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
+ this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
16,
this->rate,
this->ao_cap_mode) ;
else
- this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
+ this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
this->bits_per_sample,
this->rate,
this->ao_cap_mode) ;
diff --git a/src/libxineadec/xine_speex_decoder.c b/src/libxineadec/xine_speex_decoder.c
index 034e726a6..e99585fe5 100644
--- a/src/libxineadec/xine_speex_decoder.c
+++ b/src/libxineadec/xine_speex_decoder.c
@@ -271,7 +271,7 @@ static void speex_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
if (!this->output_open) {
this->output_open =
- this->stream->audio_out->open(this->stream->audio_out,
+ (this->stream->audio_out->open) (this->stream->audio_out,
this->stream,
16,
this->rate,
diff --git a/src/libxineadec/xine_vorbis_decoder.c b/src/libxineadec/xine_vorbis_decoder.c
index eb0883cd9..c7b1e5761 100644
--- a/src/libxineadec/xine_vorbis_decoder.c
+++ b/src/libxineadec/xine_vorbis_decoder.c
@@ -177,7 +177,7 @@ static void vorbis_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->convsize=MAX_NUM_SAMPLES/this->vi.channels;
if (!this->output_open) {
- this->output_open = this->stream->audio_out->open(this->stream->audio_out,
+ this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
this->stream,
16,
this->vi.rate,