summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-10-05 04:23:28 (GMT)
committerhobbs <hobbs>2005-10-05 04:23:28 (GMT)
commitcaa102e00df8ac629246c0c9043cfa0c906e76bb (patch)
tree4a3297054e9599dc9a6b220030f3e5ca28b542f7
parent7ec72f6ebf1d27968fe2817ed8ce3f9a94cad4e2 (diff)
downloadtcl-caa102e00df8ac629246c0c9043cfa0c906e76bb.zip
tcl-caa102e00df8ac629246c0c9043cfa0c906e76bb.tar.gz
tcl-caa102e00df8ac629246c0c9043cfa0c906e76bb.tar.bz2
* unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second
shl_load only. [Bug 1204237]
-rw-r--r--ChangeLog3
-rw-r--r--unix/tclLoadShl.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ea1a72..2710c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-10-04 Jeff Hobbs <jeffh@ActiveState.com>
+ * unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second
+ shl_load only. [Bug 1204237]
+
* doc/scan.n: scan %[] requires "one or more chars" [Bug 1277503]
* tests/winFile.test (getuser): allow valid Windows usernames.
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index 420d6c1..e8c4d32 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadShl.c,v 1.14 2005/07/19 13:37:19 dkf Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.15 2005/10/05 04:23:28 hobbs Exp $
*/
#include <dl.h>
@@ -76,7 +76,7 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
*/
native = Tcl_FSGetNativePath(pathPtr);
- handle = shl_load(native, BIND_DEFERRED|BIND_VERBOSE|DYNAMIC_PATH, 0L);
+ handle = shl_load(native, BIND_DEFERRED|BIND_VERBOSE, 0L);
if (handle == NULL) {
/*