cvs: ZendEngine2 / zend.h zend_API.c

rasmus Mon Jan 10 16:57:31 2005 EDT Modified files: /ZendEngine2 zend.h zend_API.c Log: Fix OSX DL_UNLOAD macro and actually use it to make shared extensions work on OSX. http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.267&r2=1.268&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.267 ZendEngine2/zend.h:1.268 --- ZendEngine2/zend.h:1.267 Sun Jan 9 16:05:05 2005 +++ ZendEngine2/zend.h Mon Jan 10 16:57:30 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.267 2005/01/09 21:05:05 sniper Exp $ */ +/* $Id: zend.h,v 1.268 2005/01/10 21:57:30 rasmus Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -118,7 +118,7 @@ # define ZEND_EXTENSIONS_SUPPORT 1 #elif defined(HAVE_MACH_O_DYLD_H) # define DL_LOAD(libname) zend_mh_bundle_load(libname) -# define DL_UNLOAD(handle) zend_mh_bundle_unload(handle) +# define DL_UNLOAD zend_mh_bundle_unload # define DL_FETCH_SYMBOL(h,s) zend_mh_bundle_symbol(h,s) # define DL_ERROR zend_mh_bundle_error # define DL_HANDLE void * http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.269&r2=1.270&ty=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.269 ZendEngine2/zend_API.c:1.270 --- ZendEngine2/zend_API.c:1.269 Tue Nov 2 08:10:37 2004 +++ ZendEngine2/zend_API.c Mon Jan 10 16:57:30 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.269 2004/11/02 13:10:37 sebastian Exp $ */ +/* $Id: zend_API.c,v 1.270 2005/01/10 21:57:30 rasmus Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -1523,7 +1523,7 @@ #if HAVE_LIBDL #if !(defined(NETWARE) && defined(APACHE_1_BUILD)) if (module->handle) { - dlclose(module->handle); + DL_UNLOAD(module->handle); } #endif #endif