hyanantha Sat Jul 23 07:45:29 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/main reentrancy.c php_compat.h php_open_temporary_file.c mergesort.c Log: main/php_compat.h NetWare can make use of Autoconf based build. main/php_open_temporary_file.c NetWare LibC SDK has sys/param.h so removing the redundant NEW_LIBC checks. NetWare LibC has mkstemp implementation main/mergesort.c Removing redundant sys/socket.h includes main/reentrant.c Removing the redundant rentrant time function wrappers of NetWare --Kamesh http://cvs.php.net/diff.php/php-src/main/reentrancy.c?r1=1.35.2.2&r2=1.35.2.2.4.1&ty=u Index: php-src/main/reentrancy.c diff -u php-src/main/reentrancy.c:1.35.2.2 php-src/main/reentrancy.c:1.35.2.2.4.1 --- php-src/main/reentrancy.c:1.35.2.2 Wed Aug 20 12:40:45 2003 +++ php-src/main/reentrancy.c Sat Jul 23 07:45:28 2005 @@ -28,11 +28,6 @@ #include "win32/readdir.h" #endif -#if defined(NETWARE) && !(NEW_LIBC) -/*#include <ws2nlm.h>*/ -#include <sys/socket.h> -#endif - #include "php_reentrancy.h" #include "ext/standard/php_rand.h" /* for PHP_RAND_MAX */ @@ -119,51 +114,6 @@ #endif -#if defined(NETWARE) -/* - Re-entrant versions of functions seem to be better for loading NLMs in different address space. - Since we have them now in LibC, we might as well make use of them. -*/ - -#define HAVE_LOCALTIME_R 1 -#define HAVE_CTIME_R 1 -#define HAVE_ASCTIME_R 1 -#define HAVE_GMTIME_R 1 - -PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm) -{ - /* Modified according to LibC definition */ - if (localtime_r(timep, p_tm) != NULL) - return (p_tm); - return (NULL); -} - -PHPAPI char *php_ctime_r(const time_t *clock, char *buf) -{ - /* Modified according to LibC definition */ - if (ctime_r(clock, buf) != NULL) - return (buf); - return (NULL); -} - -PHPAPI char *php_asctime_r(const struct tm *tm, char *buf) -{ - /* Modified according to LibC definition */ - if (asctime_r(tm, buf) != NULL) - return (buf); - return (NULL); -} - -PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm) -{ - /* Modified according to LibC definition */ - if (gmtime_r(timep, p_tm) != NULL) - return (p_tm); - return (NULL); -} - -#endif /* NETWARE */ - #if defined(__BEOS__) PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm) http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.11.4.6&r2=1.11.4.6.2.1&ty=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.11.4.6 php-src/main/php_compat.h:1.11.4.6.2.1 --- php-src/main/php_compat.h:1.11.4.6 Sun Jan 9 16:05:31 2005 +++ php-src/main/php_compat.h Sat Jul 23 07:45:28 2005 @@ -3,8 +3,6 @@ #ifdef PHP_WIN32 #include "config.w32.h" -#elif defined(NETWARE) -#include "config.nw.h" #else #include <php_config.h> #endif http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.18.2.10&r2=1.18.2.10.2.1&ty=u Index: php-src/main/php_open_temporary_file.c diff -u php-src/main/php_open_temporary_file.c:1.18.2.10 php-src/main/php_open_temporary_file.c:1.18.2.10.2.1 --- php-src/main/php_open_temporary_file.c:1.18.2.10 Fri May 6 12:51:54 2005 +++ php-src/main/php_open_temporary_file.c Sat Jul 23 07:45:28 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_open_temporary_file.c,v 1.18.2.10 2005/05/06 16:51:54 tony2001 Exp $ */ +/* $Id: php_open_temporary_file.c,v 1.18.2.10.2.1 2005/07/23 11:45:28 hyanantha Exp $ */ #include "php.h" @@ -33,18 +33,12 @@ #include "win32/winutil.h" #elif defined(NETWARE) #ifdef USE_WINSOCK -/*#include <ws2nlm.h>*/ #include <novsock2.h> #else #include <sys/socket.h> #endif -#ifdef NEW_LIBC #include <sys/param.h> #else -#include "netware/param.h" -#endif -#include "netware/mktemp.h" -#else #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> @@ -115,10 +109,6 @@ #endif ; #endif -#ifdef NETWARE - char *file_path = NULL; -#endif - if (!path) { return -1; } @@ -144,12 +134,6 @@ VCWD_CHMOD(opened_path, 0600); fd = VCWD_OPEN_MODE(opened_path, open_flags, 0600); } -#elif defined(NETWARE) - /* Using standard mktemp() implementation for NetWare */ - file_path = mktemp(opened_path); - if (file_path) { - fd = VCWD_OPEN(file_path, open_flags); - } #elif defined(HAVE_MKSTEMP) fd = mkstemp(opened_path); #else http://cvs.php.net/diff.php/php-src/main/mergesort.c?r1=1.12&r2=1.12.14.1&ty=u Index: php-src/main/mergesort.c diff -u php-src/main/mergesort.c:1.12 php-src/main/mergesort.c:1.12.14.1 --- php-src/main/mergesort.c:1.12 Mon Sep 9 07:17:40 2002 +++ php-src/main/mergesort.c Sat Jul 23 07:45:28 2005 @@ -64,11 +64,6 @@ #include <winsock.h> /* Includes definition for u_char */ #endif -#if defined(NETWARE) && !defined(NEW_LIBC) -/*#include <ws2nlm.h>*/ -#include <sys/socket.h> -#endif - static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC); static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php