From 3409763ff308ce9a6ee393ba2ac47447ede9fde7 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 24 Nov 2001 20:57:19 +0000 Subject: * 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. --- winsup/cygwin/ChangeLog | 8 ++++++++ winsup/cygwin/autoload.cc | 7 ++++--- winsup/cygwin/path.cc | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 636151043..72bbbda79 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2001-11-24 Christopher Faylor + + * 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 * net.cc (inet_makeaddr): Revert previous change. diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index c5fcdaf55..020ab4464 100644 --- 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 index e818ed9fd..8e1775c3c 100644 --- 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; } -- cgit v1.2.3