diff options
Diffstat (limited to 'xc/lib/X11/Xrm.c')
| -rw-r--r-- | xc/lib/X11/Xrm.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/xc/lib/X11/Xrm.c b/xc/lib/X11/Xrm.c index f74e40527..0846de47c 100644 --- a/xc/lib/X11/Xrm.c +++ b/xc/lib/X11/Xrm.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xrm.c,v 3.15 2001/01/17 19:41:50 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xrm.c,v 3.17 2001/08/01 00:44:38 tsi Exp $ */ #include <stdio.h> #include <ctype.h> @@ -58,17 +58,6 @@ from The Open Group. #include "XrmI.h" #include <X11/Xos.h> -#ifdef __STDC__ -#define Const const -#else -#define Const /**/ -#endif -#if defined(__STDC__) && !defined(NORCONST) -#define RConst const -#else -#define RConst /**/ -#endif - extern XrmQuark _XrmInternalStringToQuark(); /* @@ -293,7 +282,7 @@ typedef unsigned char XrmBits; #define is_special(bits) ((bits) & (ENDOF|BSLASH)) /* parsing types */ -static XrmBits Const xrmtypes[256] = { +static XrmBits const xrmtypes[256] = { EOS,0,0,0,0,0,0,0, 0,SPACE,EOL,0,0, #if defined(WIN32) || defined(__EMX__) /* || defined(OS2) */ @@ -497,7 +486,11 @@ static XrmDatabase NewDatabase() _XCreateMutex(&db->linfo); db->table = (NTable)NULL; db->mbstate = (XPointer)NULL; +#ifdef _XP_PRINT_SERVER_ + db->methods = NULL; +#else db->methods = _XrmInitParseInfo(&db->mbstate); +#endif if (!db->methods) db->methods = &mb_methods; } |