diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-02-25 18:02:13 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-02-25 18:02:13 +0000 |
| commit | e8023bb88716ed8fac7ef7fc59e273639132f059 (patch) | |
| tree | 90424729db078db87c45d4144bea6fcbd6c395eb | |
| parent | d565bed934ab0ea5ebd44620e0df0256f8fa0c7e (diff) | |
| download | xine-lib-e8023bb88716ed8fac7ef7fc59e273639132f059.tar.gz xine-lib-e8023bb88716ed8fac7ef7fc59e273639132f059.tar.bz2 | |
Instead of __unused, use __attr_unused, to avoid possible collisions with other libraries.
CVS patchset: 8626
CVS date: 2007/02/25 18:02:13
| -rw-r--r-- | src/combined/decoder_wavpack.c | 8 | ||||
| -rw-r--r-- | src/combined/demux_wavpack.c | 8 | ||||
| -rw-r--r-- | src/xine-utils/attributes.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/combined/decoder_wavpack.c b/src/combined/decoder_wavpack.c index f425c58a9..6b0d035e4 100644 --- a/src/combined/decoder_wavpack.c +++ b/src/combined/decoder_wavpack.c @@ -19,7 +19,7 @@ * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> * - * $Id: decoder_wavpack.c,v 1.11 2007/02/25 17:57:04 dgp85 Exp $ + * $Id: decoder_wavpack.c,v 1.12 2007/02/25 18:02:13 dgp85 Exp $ */ #define LOG_MODULE "decode_wavpack" @@ -119,9 +119,9 @@ static int xine_buffer_can_seek(void *const this_gen) { return 1; } -static int32_t xine_buffer_write_bytes(__unused void *const id, - __unused void *const data, - __unused const int32_t bcount) { +static int32_t xine_buffer_write_bytes(__attr_unused void *const id, + __attr_unused void *const data, + __attr_unused const int32_t bcount) { lprintf("xine_buffer_write_bytes: access is read-only.\n"); return 0; } diff --git a/src/combined/demux_wavpack.c b/src/combined/demux_wavpack.c index 6f5cf68ff..d0dce82a2 100644 --- a/src/combined/demux_wavpack.c +++ b/src/combined/demux_wavpack.c @@ -19,7 +19,7 @@ * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> * - * $Id: demux_wavpack.c,v 1.9 2007/02/25 17:52:16 dgp85 Exp $ + * $Id: demux_wavpack.c,v 1.10 2007/02/25 18:02:13 dgp85 Exp $ */ #define LOG_MODULE "demux_wavpack" @@ -96,9 +96,9 @@ static int xine_input_can_seek(void *const this_gen) { return INPUT_IS_SEEKABLE(this); } -static int32_t xine_input_write_bytes(__unused void *const id, - __unused void *const data, - __unused const int32_t bcount) { +static int32_t xine_input_write_bytes(__attr_unused void *const id, + __attr_unused void *const data, + __attr_unused const int32_t bcount) { lprintf("xine_input_write_bytes: acces is read-only.\n"); return 0; } diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index c2936a2a4..0328493aa 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -59,11 +59,11 @@ # define XINE_SENTINEL #endif -#ifndef __unused +#ifndef __attr_unused # ifdef SUPPORT_ATTRIBUTE_UNUSED -# define __unused __attribute__((unused)) +# define __attr_unused __attribute__((unused)) # else -# define __unused +# define __attr_unused # endif #endif |