From: Anantha Kesari H Y Date: Wed, 4 May 2005 13:48:01 +0000 (+0000) Subject: NetWare LibC dlsym works perfectly only thing that each of the extension need to... X-Git-Tag: php-5.0.5RC1~326 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ccba5514ffd7fd6405e065663af6635de61ff72;p=php NetWare LibC dlsym works perfectly only thing that each of the extension need to export a symbol with FULL capital prefix. --- diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 6cca7f0a62..cdd20fb5b3 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -142,7 +142,6 @@ void php_dl(pval *file, int type, pval *return_value TSRMLS_DC) efree(libpath); -#ifndef NETWARE get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, "get_module"); /* @@ -153,23 +152,6 @@ void php_dl(pval *file, int type, pval *return_value TSRMLS_DC) if (!get_module) get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, "_get_module"); -#else - /* NetWare doesn't support two NLMs exporting same symbol */ - { - char symbol_name[64] = "\0"; - int module_name_length = Z_STRLEN_P(file) - 4; /* '.nlm' is 4 characters; knock it off */ - - /* Take the module name (e.g.: 'php_ldap') and append '@get_module' to it */ - strncpy(symbol_name, Z_STRVAL_P(file), module_name_length); - symbol_name[module_name_length] = '\0'; - strcat(symbol_name, "@"); - strcat(symbol_name, "get_module"); - - get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, symbol_name); - } - /* NetWare doesn't prepend '_' to symbol names; so the corresponding portion of code is also - not required for NetWare */ -#endif if (!get_module) { DL_UNLOAD(handle);