diff options
author | Colin Harrison <colin.harrison-at-virgin.net> | 2008-04-29 19:45:50 +0100 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-04-29 19:45:50 +0100 |
commit | cd83cf47412b4a5979e152990c3b0870751aee07 (patch) | |
tree | b9bb4a13edad4ac4dafa65c49a1b5d2df59ec3b6 | |
parent | bb6d2a09b87560ae396085ef0981b700924333cd (diff) |
Reduce the path searches on mingw
-rw-r--r-- | src/Initialize.c | 2 | ||||
-rw-r--r-- | src/Intrinsic.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Initialize.c b/src/Initialize.c index 659287a..2a87839 100644 --- a/src/Initialize.c +++ b/src/Initialize.c @@ -376,6 +376,7 @@ static void CombineAppUserDefaults( Boolean deallocate = False; if (!(path = getenv("XUSERFILESEARCHPATH"))) { +#if defined(WIN32) && defined(__MINGW32__) char *old_path; char homedir[PATH_MAX]; GetRootDirName(homedir, PATH_MAX); @@ -396,6 +397,7 @@ static void CombineAppUserDefaults( old_path, old_path, old_path, homedir ); } deallocate = True; +#endif } filename = XtResolvePathname(dpy, NULL, NULL, NULL, path, NULL, 0, NULL); diff --git a/src/Intrinsic.c b/src/Intrinsic.c index df5c56d..3a80cb3 100644 --- a/src/Intrinsic.c +++ b/src/Intrinsic.c @@ -873,6 +873,11 @@ static int AccessFile ( if (access_file (path, pathbuf, len_pathbuf, pathret)) return 1; +#if defined(WIN32) && defined(__MINGW32__) + /* don't try others */ + return 0; +#endif + /* try the places set in the environment */ drive = getenv ("_XBASEDRIVE"); #ifdef __UNIXOS2__ |