diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-07 20:38:16 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-07 20:38:16 +0200 |
| commit | 6b0bd243d70f430f9f19a61335a4a38e8a09bc11 (patch) | |
| tree | efdd186c9dc3dfb3d6f88370a7355cf4c3f6b457 /src/audio_out | |
| parent | 57fdbd15c343a6cd3230ccb9e73e354f14731ce8 (diff) | |
| parent | b56784ba37622f28147b6a10c7ba77f9c9fbf2f7 (diff) | |
| download | xine-lib-6b0bd243d70f430f9f19a61335a4a38e8a09bc11.tar.gz xine-lib-6b0bd243d70f430f9f19a61335a4a38e8a09bc11.tar.bz2 | |
Merge changes from main repository.
Diffstat (limited to 'src/audio_out')
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 5 | ||||
| -rw-r--r-- | src/audio_out/audio_directx2_out.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index f176b7594..6ad78da2a 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -265,10 +265,7 @@ static long ao_alsa_get_volume_from_percent(int val, long min, long max) { * Error callback, we need to control this, * error message should be printed only in DEBUG mode. */ -static void -#ifdef __GNUC__ - __attribute__((format (printf, 5, 6))) -#endif +static void XINE_FORMAT_PRINTF(5, 6) error_callback(const char *file, int line, const char *function, int err, const char *fmt, ...) { #ifdef DEBUG diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index aff4412ec..7161f192d 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -151,10 +151,7 @@ static int buffer_ready(dx2_driver_t *this); /* popup a dialog with error */ -static void -#ifdef __GNUC__ - __attribute__((format (printf, 1, 2))) -#endif +static void XINE_FORMAT_PRINTF(1, 2) error_message(const char *fmt, ...) { char message[256]; va_list ap; |