From 21bcceda8d7b7ce85a997683d1cac55f2fb0c56b Mon Sep 17 00:00:00 2001
From: Anantha Kesari H Y <hyanantha@php.net>
Date: Tue, 26 Jul 2005 13:51:34 +0000
Subject: [PATCH] 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
---
 main/fopen_wrappers.c | 10 ----------
 main/main.c           |  8 --------
 main/network.c        | 11 -----------
 main/php_scandir.c    |  3 +++
 main/user_streams.c   |  6 ++++++
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index b024ba7bce..e4790d4557 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -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
diff --git a/main/main.c b/main/main.c
index d58f748b2f..8a5eeef2e7 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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
diff --git a/main/network.c b/main/network.c
index a95c23887a..0dc6013a9e 100644
--- a/main/network.c
+++ b/main/network.c
@@ -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)
diff --git a/main/php_scandir.c b/main/php_scandir.c
index bd5848e882..25d83c8220 100644
--- a/main/php_scandir.c
+++ b/main/php_scandir.c
@@ -42,7 +42,10 @@
 #endif  
 
 #include <stdlib.h>
+
+#ifndef NETWARE
 #include <search.h>
+#endif
 
 #endif /* HAVE_SCANDIR */
 
diff --git a/main/user_streams.c b/main/user_streams.c
index d807555190..826cca7026 100644
--- a/main/user_streams.c
+++ b/main/user_streams.c
@@ -647,9 +647,15 @@ static int statbuf_from_array(zval *array, php_stream_statbuf *ssb TSRMLS_DC)
 	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
-- 
2.40.0