hyanantha Wed May 4 09:48:02 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard dl.c
Log:
NetWare LibC dlsym works perfectly only thing that each of the extension need
to export a symbol with FULL capital prefix.
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.96.2.2&r2=1.96.2.3&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.96.2.2 php-src/ext/standard/dl.c:1.96.2.3
--- php-src/ext/standard/dl.c:1.96.2.2 Mon Mar 21 03:34:37 2005
+++ php-src/ext/standard/dl.c Wed May 4 09:48:01 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dl.c,v 1.96.2.2 2005/03/21 08:34:37 hyanantha Exp $ */
+/* $Id: dl.c,v 1.96.2.3 2005/05/04 13:48:01 hyanantha Exp $ */
#include "php.h"
#include "dl.h"
@@ -142,7 +142,6 @@
efree(libpath);
-#ifndef NETWARE
get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle,
"get_module");
/*
@@ -153,23 +152,6 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
