diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-09 09:27:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-09 09:27:21 +0200 |
| commit | 0de14292c4fac98f91105baf9cc16e58f25d4d77 (patch) | |
| tree | 1704165c3d7f05bde08dc6d3d52ee33aed0f270f /xkbcomp | |
| parent | 637bc31135b378ea9521b5a93b14bdce482da209 (diff) | |
| parent | 0a9d2abef2e6fac5d52556969655a62711df6418 (diff) | |
| download | vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.gz vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.bz2 vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/internal/dri_interface.h
mesalib/src/gallium/auxiliary/util/u_math.h
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/SConscript
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/es_generator.py
mesalib/src/mesa/main/imports.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_program.c
mesalib/src/mesa/vbo/vbo_save_api.c
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/Makefile.am
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/symbols/cz
xorg-server/xkeyboard-config/symbols/in
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/utils.h | 63 |
1 files changed, 9 insertions, 54 deletions
diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h index 65e37c8a5..61a598734 100644 --- a/xkbcomp/utils.h +++ b/xkbcomp/utils.h @@ -115,12 +115,7 @@ extern Boolean uSetErrorFile(char * /* name */ extern void uInformation(const char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); #define ACTION6 uAction #define ACTION5 uAction @@ -131,12 +126,7 @@ uInformation(const char * /* s */ , ... #define ACTION uAction extern void uAction(const char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); #define WARN6 uWarning #define WARN5 uWarning @@ -147,12 +137,7 @@ uInformation(const char * /* s */ , ... #define WARN uWarning extern void uWarning(const char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); #define ERROR6 uError #define ERROR5 uError @@ -163,12 +148,7 @@ uInformation(const char * /* s */ , ... #define ERROR uError extern void uError(const char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); #define FATAL6 uFatalError #define FATAL5 uFatalError @@ -179,12 +159,7 @@ uInformation(const char * /* s */ , ... #define FATAL uFatalError extern void uFatalError(const char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); /* WSGO stands for "Weird Stuff Going On" */ #define WSGO6 uInternalError @@ -196,12 +171,7 @@ uInformation(const char * /* s */ , ... #define WSGO uInternalError extern void uInternalError(const char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); extern void uSetPreErrorMessage(char * /* msg */ ); @@ -262,21 +232,11 @@ extern unsigned int DEBUG_VAR; extern void uDebug(char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); extern void uDebugNOI( /* no indent */ char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 1, 2))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(1, 2); extern Boolean uSetDebugFile(char *name); @@ -316,12 +276,7 @@ extern extern Boolean uSetEntryFile(char *name); extern void uEntry(int /* l */ , char * /* s */ , ... - ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6))) - __attribute__ ((format(printf, 2, 3))) -#endif - ; + ) _X_ATTRIBUTE_PRINTF(2, 3); extern void uExit(int l, char *rtVal); #ifdef ENTRY_TRACKING_ON |