diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 15:02:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 15:02:58 +0000 |
| commit | 423a68c8f6d63bffbbfa5c685fa2590623230782 (patch) | |
| tree | c64e0dcea59213a5bb4a6382ece730e88c0e64d1 /libXt | |
| parent | 667cb7fb6b941e823cb4812afcc3e9cf85780718 (diff) | |
| download | vcxsrv-423a68c8f6d63bffbbfa5c685fa2590623230782.tar.gz vcxsrv-423a68c8f6d63bffbbfa5c685fa2590623230782.tar.bz2 vcxsrv-423a68c8f6d63bffbbfa5c685fa2590623230782.zip | |
Solved compile error
Diffstat (limited to 'libXt')
| -rw-r--r-- | libXt/src/Initialize.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libXt/src/Initialize.c b/libXt/src/Initialize.c index 21ae9f695..75697be16 100644 --- a/libXt/src/Initialize.c +++ b/libXt/src/Initialize.c @@ -436,6 +436,7 @@ static void CombineUserDefaults( #else char *slashDotXdefaults = "/.Xdefaults"; #endif +#endif char *dpy_defaults = XResourceManagerString(dpy); if (dpy_defaults) { @@ -577,15 +578,23 @@ XrmDatabase XtScreenDatabase( if (!(filename = getenv("XENVIRONMENT"))) { int len; +#ifdef _MSC_VER + char *slashDotXdefaultsDash = "Xdefaults-"; +#else #ifdef __MINGW32__ char *slashDotXdefaultsDash = "/Xdefaults-"; #else char *slashDotXdefaultsDash = "/.Xdefaults-"; #endif +#endif +#ifndef _MSC_VER (void) GetRootDirName(filename = filenamebuf, PATH_MAX - strlen (slashDotXdefaultsDash) - 1); (void) strcat(filename, slashDotXdefaultsDash); +#else + strcpy(filename, slashDotXdefaultsDash); +#endif len = strlen(filename); GetHostname (filename+len, PATH_MAX-len); } |