From: Anantha Kesari H Y <hyanantha@php.net>
Date: Wed, 29 Sep 2004 14:42:16 +0000 (+0000)
Subject: removed unwanted NEW_LIBC checks
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dbf49e314af20e199a7a2c731ef0448c31890df;p=php

removed unwanted NEW_LIBC checks
---

diff --git a/main/php.h b/main/php.h
index f19affd178..b0acc095c3 100644
--- a/main/php.h
+++ b/main/php.h
@@ -70,10 +70,6 @@
 #ifdef NETWARE
 /* For php_get_uname() function */
 #define PHP_UNAME  "NetWare"
-/*
- * This is obtained using uname(2) on Unix and assigned in the case of Windows;
- * we'll do it this way at least for now.
- */
 #define PHP_OS      PHP_UNAME
 #endif
 
@@ -208,11 +204,7 @@ char *strerror(int);
 #include "win32/pwd.h"
 #include "win32/param.h"
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
 #include <sys/param.h>
-#else
-#include "NetWare/param.h"
-#endif
 #include "NetWare/pwd.h"
 # else
 #include <pwd.h>
@@ -260,18 +252,8 @@ char *strerror(int);
 /* global variables */
 extern pval *data;
 #if !defined(PHP_WIN32)
-#ifdef NETWARE
-#ifdef NEW_LIBC
 #define php_sleep sleep
-#else	/* NEW_LIBC */
-#define php_sleep   delay   /* sleep() and usleep() are not available */
-#define usleep      delay
-#endif	/* NEW_LIBC */
-extern char **environ;
-#else	/* NETWARE */
 extern char **environ;
-#define php_sleep sleep
-#endif	/*  NETWARE */
 #endif	/* !defined(PHP_WIN32) */
 
 #ifdef PHP_PWRITE_64