diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 14:47:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 14:47:48 +0000 |
| commit | c818610cb290773db486f0937739b19581077bf8 (patch) | |
| tree | 5d5ffc112dd33fe460f330d2d2f3f551cfe28ff7 | |
| parent | fa1a23f12b982c97f2424a5d2cd6db556e021b9c (diff) | |
| download | vcxsrv-c818610cb290773db486f0937739b19581077bf8.tar.gz vcxsrv-c818610cb290773db486f0937739b19581077bf8.tar.bz2 vcxsrv-c818610cb290773db486f0937739b19581077bf8.zip | |
Use .Xdefaults file in current dir
| -rw-r--r-- | libX11/src/GetDflt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libX11/src/GetDflt.c b/libX11/src/GetDflt.c index dfda1c64d..0443e2d1a 100644 --- a/libX11/src/GetDflt.c +++ b/libX11/src/GetDflt.c @@ -160,9 +160,13 @@ InitDefaults( * ~/.Xdefaults. Next, if there is an XENVIRONMENT environment variable, * then load that file. */ - + if (dpy->xdefaults == NULL) { + #ifdef _MSC_VER + const char *slashDotXdefaults = ".Xdefaults"; + #else const char *slashDotXdefaults = "/.Xdefaults"; + #endif (void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaults) - 1); (void) strcat (fname, slashDotXdefaults); @@ -172,7 +176,11 @@ InitDefaults( } if (!(xenv = getenv ("XENVIRONMENT"))) { + #ifdef _MSC_VER + const char *slashDotXdefaultsDash = ".Xdefaults-"; + #else const char *slashDotXdefaultsDash = "/.Xdefaults-"; + #endif int len; (void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaultsDash) - 1); |