diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
| commit | 58d9467d1b2188463b216b79b51a423559e97a75 (patch) | |
| tree | 233624f3ae7213c376b6b293160b153061ed7e43 /src/xine-utils | |
| parent | aba1fd253b3a2c5cfa13e13eefea469e4e3dff9b (diff) | |
| parent | 125e98b02c9d62e09e154f176aacc2b9c51fd164 (diff) | |
| download | xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.gz xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.bz2 | |
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
Diffstat (limited to 'src/xine-utils')
| -rw-r--r-- | src/xine-utils/Makefile.am | 1 | ||||
| -rw-r--r-- | src/xine-utils/attributes.h | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index a9c37465a..10f1714f9 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -45,4 +45,3 @@ libxineutils_la_SOURCES = $(pppc_files) \ sorted_array.c \ pool.c \ ring_buffer.c - diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index 000008753..a9be4792f 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -38,22 +38,22 @@ /* Export protected only for libxine functions */ #if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_PROTECTED) -# define XINE_PROTECTED __attribute__((visibility("protected"))) +# define XINE_PROTECTED __attribute__((__visibility__("protected"))) #elif defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT) -# define XINE_PROTECTED __attribute__((visibility("default"))) +# define XINE_PROTECTED __attribute__((__visibility__("default"))) #else # define XINE_PROTECTED #endif #ifdef SUPPORT_ATTRIBUTE_SENTINEL -# define XINE_SENTINEL __attribute__((sentinel)) +# define XINE_SENTINEL __attribute__((__sentinel__)) #else # define XINE_SENTINEL #endif #ifndef __attr_unused # ifdef SUPPORT_ATTRIBUTE_UNUSED -# define __attr_unused __attribute__((unused)) +# define __attr_unused __attribute__((__unused__)) # else # define __attr_unused # endif @@ -61,12 +61,12 @@ /* Format attributes */ #ifdef SUPPORT_ATTRIBUTE_FORMAT -# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((format(printf, fmt, var))) +# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((__format__(__printf__, fmt, var))) #else # define XINE_FORMAT_PRINTF(fmt,var) #endif #ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG -# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((format_arg(fmt))) +# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((__format_arg__(fmt))) #else # define XINE_FORMAT_PRINTF_ARG(fmt) #endif |