summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-03-11 15:02:32 (GMT)
committernijtmans <nijtmans>2010-03-11 15:02:32 (GMT)
commit9d18c761c4715d164e990bd70d90a73517f5d79f (patch)
treef21014837dc28f357b1c727976ff7a890a772eb9 /unix
parentad3425f0ba4af76882183ec4bf7a07034fd77311 (diff)
downloadtcl-9d18c761c4715d164e990bd70d90a73517f5d79f.zip
tcl-9d18c761c4715d164e990bd70d90a73517f5d79f.tar.gz
tcl-9d18c761c4715d164e990bd70d90a73517f5d79f.tar.bz2
Revert a few files from the previous commit, preventing
conflicts with Kevin's TIP #357 work
Diffstat (limited to 'unix')
-rw-r--r--unix/tclLoadDl.c4
-rw-r--r--unix/tclLoadDyld.c6
-rw-r--r--unix/tclLoadNext.c4
-rw-r--r--unix/tclLoadOSF.c4
-rw-r--r--unix/tclLoadShl.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index 3043f92..282d5bb 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadDl.c,v 1.18 2010/03/11 13:35:25 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoadDl.c,v 1.19 2010/03/11 15:02:33 nijtmans Exp $
*/
#include "tclInt.h"
@@ -104,7 +104,7 @@ TclpDlopen(
return TCL_ERROR;
}
- *unloadProcPtr = TclpUnloadFile;
+ *unloadProcPtr = &TclpUnloadFile;
*loadHandle = (Tcl_LoadHandle) handle;
return TCL_OK;
}
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 79fa227..4b64032 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadDyld.c,v 1.33 2010/03/11 13:35:25 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.34 2010/03/11 15:02:33 nijtmans Exp $
*/
#include "tclInt.h"
@@ -308,7 +308,7 @@ TclpDlopen(
dyldLoadHandle->modulePtr = modulePtr;
#endif
*loadHandle = (Tcl_LoadHandle) dyldLoadHandle;
- *unloadProcPtr = TclpUnloadFile;
+ *unloadProcPtr = &TclpUnloadFile;
result = TCL_OK;
} else {
Tcl_AppendResult(interp, errMsg, NULL);
@@ -758,7 +758,7 @@ TclpLoadMemory(
dyldLoadHandle->dyldLibHeader = NULL;
dyldLoadHandle->modulePtr = modulePtr;
*loadHandle = (Tcl_LoadHandle) dyldLoadHandle;
- *unloadProcPtr = TclpUnloadFile;
+ *unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}
#endif /* TCL_LOAD_FROM_MEMORY */
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 5b66f4e..0f82593 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadNext.c,v 1.15 2010/03/11 13:35:25 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoadNext.c,v 1.16 2010/03/11 15:02:33 nijtmans Exp $
*/
#include "tclInt.h"
@@ -96,7 +96,7 @@ TclpDlopen(
NXCloseMemory(errorStream, NX_FREEBUFFER);
*loadHandle = (Tcl_LoadHandle)1; /* A dummy non-NULL value */
- *unloadProcPtr = TclpUnloadFile;
+ *unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 4d91243..136fad9 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -31,7 +31,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.15 2010/03/11 13:35:25 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoadOSF.c,v 1.16 2010/03/11 15:02:33 nijtmans Exp $
*/
#include "tclInt.h"
@@ -120,7 +120,7 @@ TclpDlopen(
pkg++;
}
*loadHandle = pkg;
- *unloadProcPtr = TclpUnloadFile;
+ *unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index b989d7e..bf46cf5 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.18 2010/03/11 13:35:25 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.19 2010/03/11 15:02:33 nijtmans Exp $
*/
#include <dl.h>
@@ -98,7 +98,7 @@ TclpDlopen(
return TCL_ERROR;
}
*loadHandle = (Tcl_LoadHandle) handle;
- *unloadProcPtr = TclpUnloadFile;
+ *unloadProcPtr = &TclpUnloadFile;
return TCL_OK;
}