Module Name: xsrc Committed By: mrg Date: Sat Jul 23 07:37:24 UTC 2011
Modified Files: xsrc/external/mit/xkbcomp/dist: utils.h Log Message: merge xkbcomp 1.2.3 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkbcomp/dist/utils.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: xsrc/external/mit/xkbcomp/dist/utils.h diff -u xsrc/external/mit/xkbcomp/dist/utils.h:1.2 xsrc/external/mit/xkbcomp/dist/utils.h:1.3 --- xsrc/external/mit/xkbcomp/dist/utils.h:1.2 Sat Aug 22 01:04:32 2009 +++ xsrc/external/mit/xkbcomp/dist/utils.h Sat Jul 23 07:37:24 2011 @@ -117,12 +117,7 @@ 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 @@ -133,12 +128,7 @@ #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 @@ -149,12 +139,7 @@ #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 @@ -165,12 +150,7 @@ #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 @@ -181,12 +161,7 @@ #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 @@ -198,12 +173,7 @@ #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 */ ); @@ -264,21 +234,11 @@ 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); @@ -318,12 +278,7 @@ 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