summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpj <rpj>2011-07-01 15:55:23 +0000
committerrpj <rpj>2011-07-01 15:55:23 +0000
commitc34bf0c659b945f0c012b1cdd7ea80de8292c608 (patch)
treed557be140c12364eb139947e024f6f8407d035ec
parentcabf98d7523be352742b6a95165a4b4912519a50 (diff)
*** empty log message ***
-rw-r--r--ChangeLog2
-rw-r--r--pthread_win32_attach_detach_np.c13
2 files changed, 0 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e73483..d439553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,6 @@
LONG for 32 bit systems and LONGLONG for 64 bit systems.
* implement.h (MCS locks): nextFlag and waitFlag are now HANDLE type.
* ptw32_MCS_locks.c: Likewise.
- * pthread_win32_attach_detach_np.c: Set the DLL search path to exclude
- the "current directory when loading quserex.dll".
* pthread.h (#include <setjmp.h>): Removed.
* ptw32_throw.c (#include <setjmp.h>): Added.
* ptw32_threadStart.c (#include <setjmp.h>): Added.
diff --git a/pthread_win32_attach_detach_np.c b/pthread_win32_attach_detach_np.c
index f8940e5..aa30a65 100644
--- a/pthread_win32_attach_detach_np.c
+++ b/pthread_win32_attach_detach_np.c
@@ -38,11 +38,6 @@
#include "implement.h"
/*
- * Handle to kernel32.dll
- */
-static HINSTANCE ptw32_h_kernel32;
-
-/*
* Handle to quserex.dll
*/
static HINSTANCE ptw32_h_quserex;
@@ -67,7 +62,6 @@ pthread_win32_process_attach_np ()
/*
* Load QUSEREX.DLL and try to get address of QueueUserAPCEx
*/
- SetDllDirectory(""); /* Don't search in current directory */
ptw32_h_quserex = LoadLibrary (TEXT ("QUSEREX.DLL"));
if (ptw32_h_quserex != NULL)
@@ -113,8 +107,6 @@ pthread_win32_process_attach_np ()
}
}
- SetDllDirectory(NULL); /* Reset DLL search path to default */
-
if (ptw32_h_quserex)
{
ptw32_features |= PTW32_ALERTABLE_ASYNC_CANCEL;
@@ -168,11 +160,6 @@ pthread_win32_process_detach_np ()
}
(void) FreeLibrary (ptw32_h_quserex);
}
-
- if (ptw32_h_kernel32)
- {
- (void) FreeLibrary (ptw32_h_kernel32);
- }
}
return TRUE;