diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:36:21 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:36:21 -0400 |
| commit | d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76 (patch) | |
| tree | b38e2e5c6974b9a15f103e5cf884cba9fff90ef4 /Zend/zend_extensions.c | |
| parent | a88a88d0986a4a32288c102cdbfebd78d7e91d99 (diff) | |
| download | php-d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76.tar.gz | |
Imported Upstream version 5.2.0upstream/5.2.0
Diffstat (limited to 'Zend/zend_extensions.c')
| -rw-r--r-- | Zend/zend_extensions.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index e498235f9..11fa6881e 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_extensions.c,v 1.48.2.1 2006/01/04 23:53:04 andi Exp $ */ +/* $Id: zend_extensions.c,v 1.48.2.1.2.1 2006/05/09 23:53:23 helly Exp $ */ #include "zend_extensions.h" @@ -78,7 +78,7 @@ int zend_load_extension(char *path) new_extension->name); DL_UNLOAD(handle); return FAILURE; - } + } } else if (ZTS_V!=extension_version_info->thread_safe) { fprintf(stderr, "Cannot load %s - it %s thread safe, whereas Zend %s\n", new_extension->name, @@ -229,10 +229,10 @@ ZEND_API zend_extension *zend_get_extension(char *extension_name) * Support for dynamic loading of MH_BUNDLEs on Darwin / Mac OS X * */ - + #if HAVE_MACH_O_DYLD_H -void *zend_mh_bundle_load(char* bundle_path) +void *zend_mh_bundle_load(char* bundle_path) { NSObjectFileImage bundle_image; NSModule bundle_handle; @@ -242,17 +242,17 @@ void *zend_mh_bundle_load(char* bundle_path) if (NSCreateObjectFileImageFromFile(bundle_path, &bundle_image) != NSObjectFileImageSuccess) { return NULL; } - + bundle_handle = NSLinkModule(bundle_image, bundle_path, NSLINKMODULE_OPTION_PRIVATE); NSDestroyObjectFileImage(bundle_image); - + /* call the init function of the bundle */ bundle_init_nssymbol = NSLookupSymbolInModule(bundle_handle, "__init"); if (bundle_init_nssymbol != NULL) { bundle_init = NSAddressOfSymbol(bundle_init_nssymbol); bundle_init(); } - + return bundle_handle; } @@ -260,14 +260,14 @@ int zend_mh_bundle_unload(void *bundle_handle) { NSSymbol bundle_fini_nssymbol; void (*bundle_fini)(void); - + /* call the fini function of the bundle */ bundle_fini_nssymbol = NSLookupSymbolInModule(bundle_handle, "__fini"); if (bundle_fini_nssymbol != NULL) { bundle_fini = NSAddressOfSymbol(bundle_fini_nssymbol); bundle_fini(); } - + return (int) NSUnLinkModule(bundle_handle, NULL); } |