diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-05 15:06:18 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-05 15:06:18 +0000 |
| commit | ca2c9c30b5a0f0fcab1ffb52bd065e335ffd4afe (patch) | |
| tree | e43b190684d36f5ec7c4c089aec4dc42f48714f0 /src/xine-engine | |
| parent | cf86264961e27b47d57981bddb98364947ba7018 (diff) | |
| parent | 2af40655557ffc8197e3e59b9428168c2454a68b (diff) | |
| download | xine-lib-ca2c9c30b5a0f0fcab1ffb52bd065e335ffd4afe.tar.gz xine-lib-ca2c9c30b5a0f0fcab1ffb52bd065e335ffd4afe.tar.bz2 | |
Merge from 1.1 (with adaptations).
--HG--
rename : src/xine-engine/scratch.h => include/xine/scratch.h
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : src/xine-utils/xmlparser.h => include/xine/xmlparser.h
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/scratch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index f01ea9c7d..02c415e96 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.c @@ -36,7 +36,7 @@ #include <xine/xineutils.h> #include <xine/scratch.h> -static void __attribute__((__format__(__printf__, 2, 0))) +static void XINE_FORMAT_PRINTF(2, 0) scratch_printf (scratch_buffer_t *this, const char *format, va_list argp) { time_t t; |