diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-22 15:16:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-22 15:16:19 +0200 |
| commit | 9a95bb2454d9f38a5a8c3e6a10b764517006ac9f (patch) | |
| tree | cba9d8cec590107f24fb323177d0d1836f2ef361 /xkbcomp | |
| parent | 94ff13d0213bde2ff6c643c73bf9f9339fca026e (diff) | |
| download | vcxsrv-9a95bb2454d9f38a5a8c3e6a10b764517006ac9f.tar.gz vcxsrv-9a95bb2454d9f38a5a8c3e6a10b764517006ac9f.tar.bz2 vcxsrv-9a95bb2454d9f38a5a8c3e6a10b764517006ac9f.zip | |
Solved compile errors and warnings
Diffstat (limited to 'xkbcomp')
| -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 |