ext/standard/dl.c

NetWare LibC SDK has sys/param.h so removing the redundant NEW_LIBC checks.
ext/standard/flock_compat.c
Removing redundant NEW_LIBC checks
ext/standard/lcg.c
NetWare LibC SDK has sys/timeval.h so removing the redundant NEW_LIBC checks.
ext/standard/pack.c
NetWare LibC SDK has sys/param.h so removing the redundant NEW_LIBC checks.
--Kamesh

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index c7f996907f382c13f5217f8b97468db6fa06eeda..07352e35a35438662811e46d9dcc70a787b0906a 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -40,11 +40,7 @@
 #include "win32/winutil.h"
 #define GET_DL_ERROR() php_win_err()
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
 #include <sys/param.h>
-#else
-#include "netware/param.h"
-#endif
 #define GET_DL_ERROR() dlerror()
 #else
 #include <sys/param.h>

diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c
index bfeb0b83094b91e1213ebb6a8d5a331ebb2fe7d0..a9d1fd87593c848d2b36cf1e43d8d94c5ee04028 100644 (file)
--- a/ext/standard/flock_compat.c
+++ b/ext/standard/flock_compat.c
@@ -34,11 +34,7 @@
 #endif
 
 #ifdef NETWARE
-#ifdef NEW_LIBC
 #include <netinet/in.h>
-#else
-#include <sys/socket.h>
-#endif
 #endif
 
 #ifndef HAVE_FLOCK

diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c
index b4d8ee07af30691bae6f624cd46cae2ae3927b4b..2d9f5ba82ce4434af9756c20ff70843246665faf 100644 (file)
--- a/ext/standard/lcg.c
+++ b/ext/standard/lcg.c
@@ -28,12 +28,8 @@
 #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
 

diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index a6a32bdc550abacbf8a4650ae072312b4ca74690..a34bb643c43913ca25a387aae05e24d4034e3525 100644 (file)
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -32,17 +32,12 @@
 #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
 #include "ext/standard/head.h"