cvs: php-src /ext/standard file.c
| From: | Anantha Kesari H Y | Date: | Mon, 27 Sep 2004 15:37:34 +0000 |
| Subject: | cvs: php-src /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28799@lists.php.net to get a copy of this message | ||
hyanantha Mon Sep 27 11:37:34 2004 EDT
Modified files:
/php-src/ext/standard file.c
Log:
removed redundant NEW_LIBC and CLIB_STAT_PATCH checks
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.387&r2=1.388&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.387 php-src/ext/standard/file.c:1.388
--- php-src/ext/standard/file.c:1.387 Sun Sep 26 17:55:22 2004
+++ php-src/ext/standard/file.c Mon Sep 27 11:37:33 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.387 2004/09/26 21:55:22 helly Exp $ */
+/* $Id: file.c,v 1.388 2004/09/27 15:37:33 hyanantha Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -48,10 +48,16 @@
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"
-#elif defined(NETWARE) && !defined(NEW_LIBC)
-/*#include <ws2nlm.h>*/
+#elif defined(NETWARE)
+#include <sys/param.h>
+#include <sys/select.h>
+#ifdef USE_WINSOCK
+#include <novsock2.h>
+#else
#include <sys/socket.h>
-#include "netware/param.h"
+#include <netinet/in.h>
+#include <netdb.h>
+#endif
#else
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
@@ -1535,7 +1541,7 @@
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_ssb.sb.st_size);
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
+#ifdef NETWARE
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime.tv_sec);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime.tv_sec);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime.tv_sec);