* autoload.cc (IsDebuggerPresent): Make conditional load since it is not

available everywhere. * path.cc (mount_info::conv_to_win32_path): Only consider /cygdrive to be FH_CYGDRIVE, not /cygdrive/x.
msys2 · Nov 24, 2001 · 3409763 · 3409763
1 parent 53a1258
commit 3409763
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-24  Christopher Faylor  <cgf@redhat.com>
+
+	* autoload.cc (IsDebuggerPresent): Make conditional load since it is
+	not available everywhere.
+
+	* path.cc (mount_info::conv_to_win32_path): Only consider /cygdrive to
+	be FH_CYGDRIVE, not /cygdrive/x.
+
 2001-11-24  Christopher Faylor  <cgf@redhat.com>
 
 	* net.cc (inet_makeaddr): Revert previous change.

diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
@@ -476,12 +476,13 @@ LoadDLLfunc (CoInitialize, 4, ole32)
 LoadDLLfunc (CoUninitialize, 0, ole32)
 LoadDLLfunc (CoCreateInstance, 20, ole32)
 
-LoadDLLfuncEx (SignalObjectAndWait, 16, kernel32, 1)
 LoadDLLfuncEx (CancelIo, 4, kernel32, 1)
+LoadDLLfuncEx (CreateHardLinkA, 12, kernel32, 1)
+LoadDLLfuncEx (CreateToolhelp32Snapshot, 8, kernel32, 1)
+LoadDLLfuncEx (IsDebuggerPresent, 0, kernel32, 1)
 LoadDLLfuncEx (Process32First, 8, kernel32, 1)
 LoadDLLfuncEx (Process32Next, 8, kernel32, 1)
-LoadDLLfuncEx (CreateToolhelp32Snapshot, 8, kernel32, 1)
-LoadDLLfuncEx (CreateHardLinkA, 12, kernel32, 1)
+LoadDLLfuncEx (SignalObjectAndWait, 16, kernel32, 1)
 LoadDLLfunc (TryEnterCriticalSection, 4, kernel32)
 
 LoadDLLfuncEx (waveOutGetNumDevs, 0, winmm, 1)

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
@@ -1390,13 +1390,13 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst,
 	{
 	  unit = 0;
 	  dst[0] = '\0';
+	  if (mount_table->cygdrive_len > 1)
+	    devn = FH_CYGDRIVE;
 	}
       else if (!cygdrive_win32_path (pathbuf, dst, unit))
 	return ENOENT;
       else
 	*flags = cygdrive_flags;
-      if (mount_table->cygdrive_len > 1)
-	devn = FH_CYGDRIVE;
       goto out;
     }