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

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index b024ba7bce4c501a3f4e98cba3504d4d4ca32438..e4790d4557345db3df862112554750d924086585 100644 (file)
--- 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 d58f748b2f8964122d7d97ec690b0eac621ad213..8a5eeef2e7b6038d85678646ea163cf350154321 100644 (file)
--- 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 a95c23887aebf09120da5302501b027cdb48b130..0dc6013a9e0ab36eee7c335477073b2fbbeb209d 100644 (file)
--- 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 bd5848e88265a3c2d7dc978d385bf238103e848b..25d83c822028cb9edee86c555f1682624923e1b2 100644 (file)
--- 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 d807555190c92dff05257d3407a0ffeaf4af9e8f..826cca702633c76c087f9a07248e96f775d7645b 100644 (file)
--- 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