summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2005-01-10 21:57:30 +0000
committerRasmus Lerdorf <rasmus@php.net>2005-01-10 21:57:30 +0000
commit2a3ca10a61673cf25041e35cd5e790d08c754974 (patch)
tree8760e8ae2718b2c0618a2f54cdc4d5d6c200a85b
parent60744233300ca9a07cb25cc6d2b1425048a1597f (diff)
downloadphp-git-2a3ca10a61673cf25041e35cd5e790d08c754974.tar.gz
Fix OSX DL_UNLOAD macro and actually use it to make shared extensions
work on OSX.
-rw-r--r--Zend/zend.h2
-rw-r--r--Zend/zend_API.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend.h b/Zend/zend.h
index a52dfcc16a..9e74d851b2 100644
--- 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 7e25ef2857..eb7fb007fb 100644
--- 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