diff options
| author | Carlo Bramini <carlo.bramix@libero.it> | 2009-10-13 22:06:09 +0100 |
|---|---|---|
| committer | Carlo Bramini <carlo.bramix@libero.it> | 2009-10-13 22:06:09 +0100 |
| commit | 736cc44919cb9b010e4784821afb060b1352945a (patch) | |
| tree | 9080dd92c9cec9ad350f63d74a20fc6d8cc60c69 /src/xine-engine | |
| parent | 16a2e010084afeca017005cee5ae6155e69f94c6 (diff) | |
| download | xine-lib-736cc44919cb9b010e4784821afb060b1352945a.tar.gz xine-lib-736cc44919cb9b010e4784821afb060b1352945a.tar.bz2 | |
#include guards and __attribute__ fixups
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/alphablend.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/scratch.c | 2 | ||||
| -rw-r--r-- | src/xine-engine/scratch.h | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c index a9b015209..1dcd47eb7 100644 --- a/src/xine-engine/alphablend.c +++ b/src/xine-engine/alphablend.c @@ -1108,7 +1108,7 @@ static void blend_yuv_exact(uint8_t *dst_cr, uint8_t *dst_cb, int src_width, static uint8_t *(*blend_yuv_grow_extra_data(alphablend_t *extra_data, int osd_width))[ 3 ][ 2 ] { - struct __attribute__((packed)) header_s { + struct XINE_PACKED header_s { int id; int max_width; uint8_t *data[ 3 ][ 2 ]; @@ -1550,7 +1550,7 @@ static void blend_yuy2_exact(uint8_t *dst_cr, uint8_t *dst_cb, int src_width, static uint8_t *(*blend_yuy2_grow_extra_data(alphablend_t *extra_data, int osd_width))[ 3 ] { - struct __attribute__((packed)) header_s { + struct XINE_PACKED header_s { int id; int max_width; uint8_t *data[ 3 ]; diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index 696e99ffb..980af2f71 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.c @@ -37,7 +37,7 @@ #include "xineutils.h" #include "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; diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h index 1029276e3..c45af198f 100644 --- a/src/xine-engine/scratch.h +++ b/src/xine-engine/scratch.h @@ -32,10 +32,7 @@ typedef struct scratch_buffer_s scratch_buffer_t; struct scratch_buffer_s { - void -#if __GNUC__ >= 3 - __attribute__((__format__(__printf__, 2, 0))) -#endif + void XINE_FORMAT_PRINTF(2, 0) (*scratch_printf) (scratch_buffer_t *this, const char *format, va_list ap); char **(*get_content) (scratch_buffer_t *this); |