From: Gurusamy Sarathy <gsar@cpan.org>
Date: Sat, 20 Jun 1998 02:50:35 +0000 (+0000)
Subject: intuit @INC pathnames from exe location only if dll location
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=123cbbb40bdf4c0f28d1cc119d97667f70f299f3;p=p5sagit%2Fp5-mst-13.2.git

intuit @INC pathnames from exe location only if dll location
is unknown (ensures that multiple executables will coexist)

p4raw-id: //depot/perl@1158
---

diff --git a/win32/win32.c b/win32/win32.c
index 9afb0bd..68b6bb8 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -202,7 +202,9 @@ get_emd_part(char *prev_path, char *trailing_path, ...)
     va_start(ap, trailing_path);
     strip = va_arg(ap, char *);
 
-    GetModuleFileName(GetModuleHandle(NULL), mod_name, sizeof(mod_name));
+    GetModuleFileName((w32_perldll_handle == INVALID_HANDLE_VALUE)
+		      ? GetModuleHandle(NULL)
+		      : w32_perldll_handle, mod_name, sizeof(mod_name));
     ptr = strrchr(mod_name, '\\');
     while (ptr && strip) {
         /* look for directories to skip back */