diff options
Diffstat (limited to 'xkbcomp/utils.h')
| -rw-r--r-- | xkbcomp/utils.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h index 81f5893b6..e51d1a091 100644 --- a/xkbcomp/utils.h +++ b/xkbcomp/utils.h @@ -141,6 +141,10 @@ uInformation(const char * /* s */ , ... extern void uWarning(const char * /* s */ , ... ) _X_ATTRIBUTE_PRINTF(1, 2); +#ifdef ERROR +#undef ERROR +#endif + #define ERROR6 uError #define ERROR5 uError #define ERROR4 uError @@ -206,7 +210,7 @@ uInformation(const char * /* s */ , ... const char * /* s2 */ ); extern int uStrCasePrefix(const char * /* p */ , - char * /* str */ + const char * /* str */ ); #endif #ifdef HAVE_STRDUP |