From b1b8432e471c8fe89e4b088e4a2cb66c665220da Mon Sep 17 00:00:00 2001 From: Juergen Keil Date: Mon, 10 Dec 2001 12:31:08 +0000 Subject: Disable _XOPEN_SOURCE define for solaris, it causes compile errors with a va_list typedef redefine. We get the prototype for swab() on solais by including stdlib.h / unistd.h CVS patchset: 1209 CVS date: 2001/12/10 12:31:08 --- src/liba52/xine_decoder.c | 4 +++- src/libdts/xine_decoder.c | 4 +++- src/liblpcm/xine_decoder.c | 4 +++- src/xine-engine/audio_out.c | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index 4fc3de135..8f6c55afc 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/xine_decoder.c @@ -17,13 +17,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.13 2001/12/09 18:31:01 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.14 2001/12/10 12:31:08 jkeil Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ +#ifndef __sun /* required for swab() */ #define _XOPEN_SOURCE 500 +#endif #include diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c index 7ae35ba00..442229668 100644 --- a/src/libdts/xine_decoder.c +++ b/src/libdts/xine_decoder.c @@ -17,15 +17,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.8 2001/12/09 18:31:02 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.9 2001/12/10 12:31:09 jkeil Exp $ * * 04-09-2001 DTS passtrough (C) Joachim Koenig * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton * */ +#ifndef __sun /* required for swab() */ #define _XOPEN_SOURCE 500 +#endif #include #include diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c index 5359a8bcd..b449b7a70 100644 --- a/src/liblpcm/xine_decoder.c +++ b/src/liblpcm/xine_decoder.c @@ -17,14 +17,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.15 2001/12/09 23:56:22 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.16 2001/12/10 12:31:09 jkeil Exp $ * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk * * stuff needed to turn libac3 into a xine decoder plugin */ +#ifndef __sun #define _XOPEN_SOURCE 500 +#endif #include #include diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index ba112d0a6..262f9851f 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.37 2001/12/09 18:31:02 jcdutton Exp $ + * $Id: audio_out.c,v 1.38 2001/12/10 12:31:09 jkeil Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe @@ -41,8 +41,10 @@ * Currently, I don't think resampling functions, as I cannot test it. */ +#ifndef __sun /* required for swab() */ #define _XOPEN_SOURCE 500 +#endif /* required for FNDELAY decl */ #define _BSD_SOURCE 1 -- cgit v1.2.3