aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
commit0a9d2abef2e6fac5d52556969655a62711df6418 (patch)
tree86d46767bedf8271ec0f67442259c5b3e7a8bb87 /xkbcomp
parentadeb8256da9b636648178f729d7b3316a0a8e990 (diff)
downloadvcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.gz
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.bz2
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.zip
mesa xkbcomp xkeyboard-config git update 9 Jun 2011
Diffstat (limited to 'xkbcomp')
-rw-r--r--xkbcomp/utils.h63
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