diff options
| -rw-r--r-- | xkbcomp/makefile | 2 | ||||
| -rw-r--r-- | xkbcomp/utils.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/xkbcomp/makefile b/xkbcomp/makefile index 08c3f119f..68e35a80a 100644 --- a/xkbcomp/makefile +++ b/xkbcomp/makefile @@ -21,7 +21,7 @@ else WINAPP = xkbcomp endif -DEFINES += DFLT_XKB_CONFIG_ROOT="\".\"" +DEFINES += DFLT_XKB_CONFIG_ROOT="\".\"" PACKAGE_VERSION="\"1.2.3\"" INCLUDES += $(OBJDIR) diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h index 61a598734..a92cd83eb 100644 --- a/xkbcomp/utils.h +++ b/xkbcomp/utils.h @@ -139,6 +139,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 |