hyanantha Mon Jul 25 09:08:33 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/standard dl.c fsock.h lcg.c link.c microtime.c Log: ext/standard/dl.c NetWare LibC dlsym works perfectly only thing that each of the extension need to export a symbol with FULL capital prefix. ext/standard/fsock.h Removing redundant inclusion of headers for NetWare ext/standard/lcg.c NetWare LibC SDK sys/time.h implicitly includes sys/timval.h so nothing special needed for NetWare here. ext/standard/link.c NetWare LibC SDK has pwd.h. ext/standard/microtime.c Removing redundant NEW_LIBC checks and nothing special about NetWare here. including sys/time.h will do the needful. --Kamesh http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.79.2.3.8.1&r2=1.79.2.3.8.2&ty=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.79.2.3.8.1 php-src/ext/standard/dl.c:1.79.2.3.8.2 --- php-src/ext/standard/dl.c:1.79.2.3.8.1 Sat Jul 23 07:06:52 2005 +++ php-src/ext/standard/dl.c Mon Jul 25 09:08:32 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.79.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */ +/* $Id: dl.c,v 1.79.2.3.8.2 2005/07/25 13:08:32 hyanantha Exp $ */ #include "php.h" #include "dl.h" @@ -143,7 +143,6 @@ efree(libpath); -#ifndef NETWARE get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, "get_module"); /* @@ -154,23 +153,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); http://cvs.php.net/diff.php/php-src/ext/standard/fsock.h?r1=1.43.2.1&r2=1.43.2.1.8.1&ty=u Index: php-src/ext/standard/fsock.h diff -u php-src/ext/standard/fsock.h:1.43.2.1 php-src/ext/standard/fsock.h:1.43.2.1.8.1 --- php-src/ext/standard/fsock.h:1.43.2.1 Tue Dec 31 11:35:28 2002 +++ php-src/ext/standard/fsock.h Mon Jul 25 09:08:32 2005 @@ -18,21 +18,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.43.2.1 2002/12/31 16:35:28 sebastian Exp $ */ +/* $Id: fsock.h,v 1.43.2.1.8.1 2005/07/25 13:08:32 hyanantha Exp $ */ /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */ #ifndef FSOCK_H #define FSOCK_H -#ifdef NETWARE -#ifdef NEW_LIBC -#include "sys/timeval.h" -#else -#include "netware/time_nw.h" /* For 'timeval' */ -#endif -#endif - #include "file.h" #include "php_network.h" http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.33.2.3.8.1&r2=1.33.2.3.8.2&ty=u Index: php-src/ext/standard/lcg.c diff -u php-src/ext/standard/lcg.c:1.33.2.3.8.1 php-src/ext/standard/lcg.c:1.33.2.3.8.2 --- php-src/ext/standard/lcg.c:1.33.2.3.8.1 Sat Jul 23 07:06:52 2005 +++ php-src/ext/standard/lcg.c Mon Jul 25 09:08:32 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: lcg.c,v 1.33.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */ +/* $Id: lcg.c,v 1.33.2.3.8.2 2005/07/25 13:08:32 hyanantha Exp $ */ #include "php.h" #include "php_lcg.h" @@ -27,8 +27,6 @@ #ifdef PHP_WIN32 #include "win32/time.h" -#elif defined(NETWARE) -#include <sys/timeval.h> #else #include <sys/time.h> #endif http://cvs.php.net/diff.php/php-src/ext/standard/link.c?r1=1.42.2.5&r2=1.42.2.5.2.1&ty=u Index: php-src/ext/standard/link.c diff -u php-src/ext/standard/link.c:1.42.2.5 php-src/ext/standard/link.c:1.42.2.5.2.1 --- php-src/ext/standard/link.c:1.42.2.5 Mon Nov 1 19:38:07 2004 +++ php-src/ext/standard/link.c Mon Jul 25 09:08:32 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.42.2.5 2004/11/02 00:38:07 iliaa Exp $ */ +/* $Id: link.c,v 1.42.2.5.2.1 2005/07/25 13:08:32 hyanantha Exp $ */ #include "php.h" #include "php_filestat.h" @@ -33,8 +33,6 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include "win32/pwd.h" -#elif defined(NETWARE) -#include "netware/pwd.h" #else #include <pwd.h> #endif @@ -91,11 +89,7 @@ PHP_FUNCTION(linkinfo) { zval **filename; -#if defined(NETWARE) && defined(CLIB_STAT_PATCH) - struct stat_libc sb; -#else struct stat sb; -#endif int ret; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { http://cvs.php.net/diff.php/php-src/ext/standard/microtime.c?r1=1.39.2.2&r2=1.39.2.2.2.1&ty=u Index: php-src/ext/standard/microtime.c diff -u php-src/ext/standard/microtime.c:1.39.2.2 php-src/ext/standard/microtime.c:1.39.2.2.2.1 --- php-src/ext/standard/microtime.c:1.39.2.2 Tue Mar 1 16:34:30 2005 +++ php-src/ext/standard/microtime.c Mon Jul 25 09:08:32 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.39.2.2 2005/03/01 21:34:30 iliaa Exp $ */ +/* $Id: microtime.c,v 1.39.2.2.2.1 2005/07/25 13:08:32 hyanantha Exp $ */ #include "php.h" @@ -25,12 +25,6 @@ #endif #ifdef PHP_WIN32 #include "win32/time.h" -#elif defined(NETWARE) -#ifdef NEW_LIBC -#include <sys/timeval.h> -#else -#include "netware/time_nw.h" -#endif #else #include <sys/time.h> #endif
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php