diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-23 21:52:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-23 21:52:56 (GMT) |
| commit | 8ceba044853804c9710cd28a34999bde36368db9 (patch) | |
| tree | 973de2353dec691c31f3af550684f7ddccdf6c12 /unix/tclLoadDyld.c | |
| parent | 07c7107940a7846e7eb6636927feb79f31e94659 (diff) | |
| parent | fb0fd528e967d229029a88b65bc2dbfce95d84f9 (diff) | |
| download | tcl-8ceba044853804c9710cd28a34999bde36368db9.zip tcl-8ceba044853804c9710cd28a34999bde36368db9.tar.gz tcl-8ceba044853804c9710cd28a34999bde36368db9.tar.bz2 | |
merge trunktip_318_update
Diffstat (limited to 'unix/tclLoadDyld.c')
| -rw-r--r-- | unix/tclLoadDyld.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c index 95735a4..4f39d1f 100644 --- a/unix/tclLoadDyld.c +++ b/unix/tclLoadDyld.c @@ -16,7 +16,7 @@ #include "tclInt.h" #ifndef MODULE_SCOPE -# define MODULE_SCOPE extern +# define MODULE_SCOPE extern #endif /* @@ -148,10 +148,11 @@ TclpDlopen( Tcl_LoadHandle *loadHandle, /* Filled with token for dynamically loaded * file which will be passed back to * (*unloadProcPtr)() to unload the file. */ - Tcl_FSUnloadFileProc **unloadProcPtr) + Tcl_FSUnloadFileProc **unloadProcPtr, /* Filled with address of Tcl_FSUnloadFileProc * function which should be used for this * file. */ + int flags) { Tcl_DyldLoadHandle *dyldLoadHandle; Tcl_LoadHandle newHandle; @@ -238,7 +239,7 @@ TclpDlopen( &dyldObjFileImage); if (err == NSObjectFileImageSuccess && dyldObjFileImage) { module = NSLinkModule(dyldObjFileImage, nativePath, - NSLINKMODULE_OPTION_BINDNOW + NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_RETURN_ON_ERROR); NSDestroyObjectFileImage(dyldObjFileImage); if (module) { @@ -552,10 +553,11 @@ TclpLoadMemory( Tcl_LoadHandle *loadHandle, /* Filled with token for dynamically loaded * file which will be passed back to * (*unloadProcPtr)() to unload the file. */ - Tcl_FSUnloadFileProc **unloadProcPtr) + Tcl_FSUnloadFileProc **unloadProcPtr, /* Filled with address of Tcl_FSUnloadFileProc * function which should be used for this * file. */ + int flags) { Tcl_LoadHandle newHandle; Tcl_DyldLoadHandle *dyldLoadHandle; @@ -658,7 +660,8 @@ TclpLoadMemory( */ module = NSLinkModule(dyldObjFileImage, "[Memory Based Bundle]", - NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_RETURN_ON_ERROR); + NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_PRIVATE + | NSLINKMODULE_OPTION_RETURN_ON_ERROR); NSDestroyObjectFileImage(dyldObjFileImage); if (!module) { NSLinkEditErrors editError; |