diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-08-26 05:16:46 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-26 05:16:46 +0000 |
| commit | 2b2f3d3877cb7927f196d01a5df6a27bf8d0518a (patch) | |
| tree | 88a3a9e121811aecb800d045d73318b3459fb9f5 | |
| parent | 07066da0902df91c71f2adb81d1a17ec29165553 (diff) | |
Define ERRORDB/KEYSYMDB to XERRORDB/XKEYSYMDB if the former is undefined but the latter is. (Gerte Hoogewerf)
| -rw-r--r-- | src/ErrDes.c | 6 | ||||
| -rw-r--r-- | src/StrKeysym.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ErrDes.c b/src/ErrDes.c index f6853f7..0905efa 100644 --- a/src/ErrDes.c +++ b/src/ErrDes.c @@ -1,6 +1,6 @@ /* * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ - * $XdotOrg: lib/X11/src/ErrDes.c,v 1.7 2005-07-03 07:00:55 daniels Exp $ + * $XdotOrg: lib/X11/src/ErrDes.c,v 1.8 2005-08-26 05:16:46 daniels Exp $ */ /*********************************************************** @@ -60,7 +60,11 @@ SOFTWARE. #include <stdio.h> #ifndef ERRORDB +#ifndef XERRORDB #define ERRORDB "/usr/lib/X11/XErrorDB" +#else +#define ERRORDB XERRORDB +#endif #endif /* diff --git a/src/StrKeysym.c b/src/StrKeysym.c index b6874d3..74ccecb 100644 --- a/src/StrKeysym.c +++ b/src/StrKeysym.c @@ -39,7 +39,11 @@ in this Software without prior written authorization from The Open Group. #include "Key.h" #ifndef KEYSYMDB +#ifndef XKEYSYMDB #define KEYSYMDB "/usr/lib/X11/XKeysymDB" +#else +#define KEYSYMDB XKEYSYMDB +#endif #endif static Bool initialized; |