Fix OSX DL_UNLOAD macro and actually use it to make shared extensions

work on OSX.

diff --git a/Zend/zend.h b/Zend/zend.h
index a52dfcc16a51a7c322a274edb35aac329c2a15fa..9e74d851b2d928e190bd073b227bdfad3765bcc7 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -118,7 +118,7 @@ const char *zend_mh_bundle_error(void);
 # 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 *

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 7e25ef285722c79ee7ad03d20346f3c260be90b7..eb7fb007fbf64941d8636a5291052b58dac61e02 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1523,7 +1523,7 @@ void module_destructor(zend_module_entry *module)
 #if HAVE_LIBDL
 #if !(defined(NETWARE) && defined(APACHE_1_BUILD))
         if (module->handle) {
-            dlclose(module->handle);
+            DL_UNLOAD(module->handle);
         }
 #endif
 #endif