hyanantha Fri Jul 1 04:00:45 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main reentrancy.c Log: NetWare LibC has reentrant versions of time functions this code is of no use. -- Kamesh from hyanantha's account http://cvs.php.net/diff.php/php-src/main/reentrancy.c?r1=1.40.2.1&r2=1.40.2.2&ty=u Index: php-src/main/reentrancy.c diff -u php-src/main/reentrancy.c:1.40.2.1 php-src/main/reentrancy.c:1.40.2.2 --- php-src/main/reentrancy.c:1.40.2.1 Wed Jun 29 02:46:59 2005 +++ php-src/main/reentrancy.c Fri Jul 1 04:00:44 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: reentrancy.c,v 1.40.2.1 2005/06/29 06:46:59 hyanantha Exp $ */ +/* $Id: reentrancy.c,v 1.40.2.2 2005/07/01 08:00:44 hyanantha Exp $ */ #include <sys/types.h> #include <string.h> @@ -115,51 +115,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)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php