cvs: php-src(PHP_4_4) /main fopen_wrappers.c main.c network.c php_scandir.c user_streams.c

hyanantha Tue Jul 26 09:51:37 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/main main.c fopen_wrappers.c user_streams.c php_scandir.c network.c Log: main/main.c Removing redundant NEW_LIBC checks main/fopen_wrappers.c NetWare LibC SDK has sys/pwd.h and sys/param.h Removed redundant NEW_LIBC checks main/user_streams.c NetWare specific stat structure issues. main/php_scandir.c Netware LibC SDK does not have search.h main/network.c Removed redundant NEW_LIBC checks. NetWare LibC SDK has sys/param.h --Kamesh http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63.2.1&r2=1.512.2.63.2.2&ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.512.2.63.2.1 php-src/main/main.c:1.512.2.63.2.2 --- php-src/main/main.c:1.512.2.63.2.1 Mon Jun 20 15:59:43 2005 +++ php-src/main/main.c Tue Jul 26 09:51:31 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.512.2.63.2.1 2005/06/20 19:59:43 tony2001 Exp $ */ +/* $Id: main.c,v 1.512.2.63.2.2 2005/07/26 13:51:31 hyanantha Exp $ */ /* {{{ includes */ @@ -29,14 +29,6 @@ #include "win32/signal.h" #include <process.h> #elif defined(NETWARE) -#ifdef NEW_LIBC -#include <sys/timeval.h> -#else -#include "netware/time_nw.h" -#endif -/*#include "netware/signal_nw.h"*/ -/*#include "netware/env.h"*/ /* Temporary */ -/*#include <process.h>*/ #ifdef USE_WINSOCK #include <novsock2.h> #endif http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.153.2.10&r2=1.153.2.10.2.1&ty=u Index: php-src/main/fopen_wrappers.c diff -u php-src/main/fopen_wrappers.c:1.153.2.10 php-src/main/fopen_wrappers.c:1.153.2.10.2.1 --- php-src/main/fopen_wrappers.c:1.153.2.10 Wed Feb 2 18:44:07 2005 +++ php-src/main/fopen_wrappers.c Tue Jul 26 09:51:33 2005 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.153.2.10 2005/02/02 23:44:07 iliaa Exp $ */ +/* $Id: fopen_wrappers.c,v 1.153.2.10.2.1 2005/07/26 13:51:33 hyanantha Exp $ */ /* {{{ includes */ @@ -36,14 +36,6 @@ #include <winsock.h> #define O_RDONLY _O_RDONLY #include "win32/param.h" -#elif defined(NETWARE) -/*#include <ws2nlm.h>*/ -/*#include <sys/socket.h>*/ -#ifdef NEW_LIBC -#include <sys/param.h> -#else -#include "netware/param.h" -#endif #else #include <sys/param.h> #endif @@ -57,8 +49,6 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include "win32/pwd.h" -#elif defined(NETWARE) -#include "netware/pwd.h" #else #include <pwd.h> #endif http://cvs.php.net/diff.php/php-src/main/user_streams.c?r1=1.29.2.4&r2=1.29.2.4.2.1&ty=u Index: php-src/main/user_streams.c diff -u php-src/main/user_streams.c:1.29.2.4 php-src/main/user_streams.c:1.29.2.4.2.1 --- php-src/main/user_streams.c:1.29.2.4 Mon Jun 21 15:33:47 2004 +++ php-src/main/user_streams.c Tue Jul 26 09:51:34 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: user_streams.c,v 1.29.2.4 2004/06/21 19:33:47 pollita Exp $ */ +/* $Id: user_streams.c,v 1.29.2.4.2.1 2005/07/26 13:51:34 hyanantha Exp $ */ #include "php.h" #include "php_globals.h" @@ -647,9 +647,15 @@ STAT_PROP_ENTRY(rdev); #endif STAT_PROP_ENTRY(size); +#ifdef NETWARE + STAT_PROP_ENTRY(atime.tv_sec); + STAT_PROP_ENTRY(mtime.tv_sec); + STAT_PROP_ENTRY(ctime.tv_sec); +#else STAT_PROP_ENTRY(atime); STAT_PROP_ENTRY(mtime); STAT_PROP_ENTRY(ctime); +#endif #ifdef HAVE_ST_BLKSIZE STAT_PROP_ENTRY(blksize); #endif http://cvs.php.net/diff.php/php-src/main/php_scandir.c?r1=1.2.2.7&r2=1.2.2.7.2.1&ty=u Index: php-src/main/php_scandir.c diff -u php-src/main/php_scandir.c:1.2.2.7 php-src/main/php_scandir.c:1.2.2.7.2.1 --- php-src/main/php_scandir.c:1.2.2.7 Sun Jan 9 16:05:31 2005 +++ php-src/main/php_scandir.c Tue Jul 26 09:51:34 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_scandir.c,v 1.2.2.7 2005/01/09 21:05:31 sniper Exp $ */ +/* $Id: php_scandir.c,v 1.2.2.7.2.1 2005/07/26 13:51:34 hyanantha Exp $ */ #ifdef PHP_WIN32 #include "config.w32.h" @@ -42,7 +42,10 @@ #endif #include <stdlib.h> + +#ifndef NETWARE #include <search.h> +#endif #endif /* HAVE_SCANDIR */ http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.83.2.27&r2=1.83.2.27.2.1&ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.83.2.27 php-src/main/network.c:1.83.2.27.2.1 --- php-src/main/network.c:1.83.2.27 Tue Jan 4 05:35:56 2005 +++ php-src/main/network.c Tue Jul 26 09:51:34 2005 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.83.2.27 2005/01/04 10:35:56 sniper Exp $ */ +/* $Id: network.c,v 1.83.2.27.2.1 2005/07/26 13:51:34 hyanantha Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -29,13 +29,6 @@ #include <winsock.h> #define O_RDONLY _O_RDONLY #include "win32/param.h" -#elif defined(NETWARE) -#ifdef NEW_LIBC -#include <sys/timeval.h> -#include <sys/param.h> -#else -#include "netware/time_nw.h" -#endif #else #include <sys/param.h> #endif @@ -63,15 +56,11 @@ #if defined(NETWARE) #ifdef USE_WINSOCK -/*#include <ws2nlm.h>*/ #include <novsock2.h> #else -/* New headers for socket stuff */ -#ifdef NEW_LIBC #include <netinet/in.h> #include <netdb.h> #include <sys/select.h> -#endif #include <sys/socket.h> #endif #elif !defined(PHP_WIN32)