cvs: php4 /ext/standard math.c microtime.c pack.c pageinfo.c rand.c

hyanantha Fri Sep 6 03:44:31 2002 EDT Modified files: /php4/ext/standard math.c microtime.c pack.c pageinfo.c rand.c Log: NetWare related changes/modifications Index: php4/ext/standard/math.c diff -u php4/ext/standard/math.c:1.86 php4/ext/standard/math.c:1.87 --- php4/ext/standard/math.c:1.86 Fri Aug 23 21:19:28 2002 +++ php4/ext/standard/math.c Fri Sep 6 03:44:30 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: math.c,v 1.86 2002/08/24 01:19:28 helly Exp $ */ +/* $Id: math.c,v 1.87 2002/09/06 07:44:30 hyanantha Exp $ */ #include "php.h" #include "php_math.h" @@ -314,7 +314,8 @@ /* }}} */ -#ifndef PHP_WIN32 +/*#ifndef PHP_WIN32*/ +#if !defined(PHP_WIN32) && !defined(NETWARE) /* {{{ proto float asinh(float number) Returns the inverse hyperbolic sine of the number, i.e. the value whose hyperbolic sine is number */ @@ -471,7 +472,8 @@ /* }}} */ -#ifndef PHP_WIN32 +/*#ifndef PHP_WIN32*/ +#if !defined(PHP_WIN32) && !defined(NETWARE) /* {{{ proto float expm1(float number) Returns exp(number) - 1, computed in a way that accurate even when the value of number is close to zero */ Index: php4/ext/standard/microtime.c diff -u php4/ext/standard/microtime.c:1.37 php4/ext/standard/microtime.c:1.38 --- php4/ext/standard/microtime.c:1.37 Mon Aug 19 17:59:46 2002 +++ php4/ext/standard/microtime.c Fri Sep 6 03:44:30 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.37 2002/08/19 21:59:46 iliaa Exp $ */ +/* $Id: microtime.c,v 1.38 2002/09/06 07:44:30 hyanantha Exp $ */ #include "php.h" @@ -25,6 +25,12 @@ #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 Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.39 php4/ext/standard/pack.c:1.40 --- php4/ext/standard/pack.c:1.39 Tue Aug 13 19:12:54 2002 +++ php4/ext/standard/pack.c Fri Sep 6 03:44:30 2002 @@ -15,7 +15,7 @@ | Author: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.39 2002/08/13 23:12:54 kalowsky Exp $ */ +/* $Id: pack.c,v 1.40 2002/09/06 07:44:30 hyanantha Exp $ */ #include "php.h" @@ -30,6 +30,18 @@ #include <winsock.h> #define O_RDONLY _O_RDONLY #include "win32/param.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 #else #include <sys/param.h> #endif @@ -40,6 +52,8 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include "win32/pwd.h" +#elif defined(NETWARE) +#include "netware/pwd.h" #else #include <pwd.h> #endif Index: php4/ext/standard/pageinfo.c diff -u php4/ext/standard/pageinfo.c:1.32 php4/ext/standard/pageinfo.c:1.33 --- php4/ext/standard/pageinfo.c:1.32 Fri Aug 16 11:04:00 2002 +++ php4/ext/standard/pageinfo.c Fri Sep 6 03:44:30 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pageinfo.c,v 1.32 2002/08/16 15:04:00 iliaa Exp $ */ +/* $Id: pageinfo.c,v 1.33 2002/09/06 07:44:30 hyanantha Exp $ */ #include "php.h" #include "pageinfo.h" @@ -27,6 +27,11 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include "win32/pwd.h" +#elif defined(NETWARE) +#ifdef ZTS +extern int basic_globals_id; +#endif +#include "netware/pwd.h" #else #include <pwd.h> #endif @@ -59,7 +64,11 @@ */ PHPAPI void php_statpage(TSRMLS_D) { +#if defined(NETWARE) && defined(CLIB_STAT_PATCH) + struct stat_libc *pstat; +#else struct stat *pstat; +#endif pstat = sapi_get_stat(TSRMLS_C); @@ -68,7 +77,11 @@ BG(page_uid) = pstat->st_uid; BG(page_gid) = pstat->st_gid; BG(page_inode) = pstat->st_ino; +#if defined(NETWARE) && defined(NEW_LIBC) + BG(page_mtime) = (pstat->st_mtime).tv_nsec; +#else BG(page_mtime) = pstat->st_mtime; +#endif } else { /* handler for situations where there is no source file, ex. php -r */ BG(page_uid) = getuid(); BG(page_gid) = getgid(); Index: php4/ext/standard/rand.c diff -u php4/ext/standard/rand.c:1.59 php4/ext/standard/rand.c:1.60 --- php4/ext/standard/rand.c:1.59 Sun Jun 9 00:26:36 2002 +++ php4/ext/standard/rand.c Fri Sep 6 03:44:30 2002 @@ -20,7 +20,7 @@ | Based on code from: Shawn Cokus <Cokus@math.washington.edu> | +----------------------------------------------------------------------+ */ -/* $Id: rand.c,v 1.59 2002/06/09 04:26:36 andrei Exp $ */ +/* $Id: rand.c,v 1.60 2002/09/06 07:44:30 hyanantha Exp $ */ #include <stdlib.h> @@ -29,6 +29,10 @@ # define WIN32_LEAN_AND_MEAN # endif # include <windows.h> +#endif + +#if defined(NETWARE) && !defined(NEW_LIBC) /* For getpid() used below */ +#include "netware/pwd.h" #endif #include "php.h"