cvs: php-src /main php.h

From: Date: Wed, 29 Sep 2004 14:42:16 +0000
Subject: cvs: php-src /main php.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-28842@lists.php.net to get a copy of this message
hyanantha Wed Sep 29 10:42:16 2004 EDT Modified files: /php-src/main php.h Log: removed unwanted NEW_LIBC checks http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203&r2=1.204&ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.203 php-src/main/php.h:1.204 --- php-src/main/php.h:1.203 Sun Jan 11 19:19:40 2004 +++ php-src/main/php.h Wed Sep 29 10:42:16 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.203 2004/01/12 00:19:40 helly Exp $ */ +/* $Id: php.h,v 1.204 2004/09/29 14:42:16 hyanantha Exp $ */ #ifndef PHP_H #define 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 @@ #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 @@ /* 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

« previous php.cvs (#28842) next »