diff options
| author | Derick Rethans <derick@php.net> | 2003-04-18 17:55:45 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2003-04-18 17:55:45 +0000 |
| commit | bfaf618b08c188939cc174d4b73d5b83a5cf169a (patch) | |
| tree | 43e8cca97cff4d4ca4e6ef065aaad37a1e9c1052 /Zend/zend_extensions.c | |
| parent | c568087d6e833103944e366d003a53a88917a15b (diff) | |
| download | php-git-bfaf618b08c188939cc174d4b73d5b83a5cf169a.tar.gz | |
- Revert my symbol fix patch, and merge in Stas' fixes to Zend Engine 1.
Diffstat (limited to 'Zend/zend_extensions.c')
| -rw-r--r-- | Zend/zend_extensions.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 9e5020d2e8..a1372dff2c 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -42,7 +42,13 @@ int zend_load_extension(char *path) } extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info"); + if (!extension_version_info) { + extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info"); + } new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry"); + if (!new_extension) { + new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "_zend_extension_entry"); + } if (!extension_version_info || !new_extension) { fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path); DL_UNLOAD(handle); |