From 70f9d2d390997a46a7d927d586b2074e8d52715e Mon Sep 17 00:00:00 2001
From: Anantha Kesari H Y <hyanantha@php.net>
Date: Sat, 23 Jul 2005 11:06:52 +0000
Subject: [PATCH] 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

---
 ext/standard/dl.c           | 4 ----
 ext/standard/flock_compat.c | 4 ----
 ext/standard/lcg.c          | 4 ----
 ext/standard/pack.c         | 5 -----
 4 files changed, 17 deletions(-)

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index c7f996907f..07352e35a3 100644
--- 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 bfeb0b8309..a9d1fd8759 100644
--- 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 b4d8ee07af..2d9f5ba82c 100644
--- 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 a6a32bdc55..a34bb643c4 100644
--- 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"
-- 
2.40.0