hyanantha Sat Jul 23 07:06:53 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/standard dl.c flock_compat.c lcg.c pack.c Log: 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 http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.79.2.3&r2=1.79.2.3.8.1&ty=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.79.2.3 php-src/ext/standard/dl.c:1.79.2.3.8.1 --- php-src/ext/standard/dl.c:1.79.2.3 Wed Jan 29 10:40:24 2003 +++ php-src/ext/standard/dl.c Sat Jul 23 07:06:52 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.79.2.3 2003/01/29 15:40:24 edink Exp $ */ +/* $Id: dl.c,v 1.79.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */ #include "php.h" #include "dl.h" @@ -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> http://cvs.php.net/diff.php/php-src/ext/standard/flock_compat.c?r1=1.21.2.2&r2=1.21.2.2.8.1&ty=u Index: php-src/ext/standard/flock_compat.c diff -u php-src/ext/standard/flock_compat.c:1.21.2.2 php-src/ext/standard/flock_compat.c:1.21.2.2.8.1 --- php-src/ext/standard/flock_compat.c:1.21.2.2 Tue Dec 31 11:35:27 2002 +++ php-src/ext/standard/flock_compat.c Sat Jul 23 07:06:52 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: flock_compat.c,v 1.21.2.2 2002/12/31 16:35:27 sebastian Exp $ */ +/* $Id: flock_compat.c,v 1.21.2.2.8.1 2005/07/23 11:06:52 hyanantha Exp $ */ #include <php.h> #include <errno.h> @@ -34,11 +34,7 @@ #endif #ifdef NETWARE -#ifdef NEW_LIBC #include <netinet/in.h> -#else -#include <sys/socket.h> -#endif #endif #ifndef HAVE_FLOCK http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.33.2.3&r2=1.33.2.3.8.1&ty=u Index: php-src/ext/standard/lcg.c diff -u php-src/ext/standard/lcg.c:1.33.2.3 php-src/ext/standard/lcg.c:1.33.2.3.8.1 --- php-src/ext/standard/lcg.c:1.33.2.3 Mon Mar 31 00:39:45 2003 +++ php-src/ext/standard/lcg.c Sat Jul 23 07:06:52 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: lcg.c,v 1.33.2.3 2003/03/31 05:39:45 sas Exp $ */ +/* $Id: lcg.c,v 1.33.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */ #include "php.h" #include "php_lcg.h" @@ -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 http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.40.2.7&r2=1.40.2.7.2.1&ty=u Index: php-src/ext/standard/pack.c diff -u php-src/ext/standard/pack.c:1.40.2.7 php-src/ext/standard/pack.c:1.40.2.7.2.1 --- php-src/ext/standard/pack.c:1.40.2.7 Tue Jan 25 17:52:19 2005 +++ php-src/ext/standard/pack.c Sat Jul 23 07:06:52 2005 @@ -15,7 +15,7 @@ | Author: Chris Schneider <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.40.2.7 2005/01/25 22:52:19 iliaa Exp $ */ +/* $Id: pack.c,v 1.40.2.7.2.1 2005/07/23 11:06:52 hyanantha Exp $ */ #include "php.h" @@ -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"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php