guenter Tue, 03 Nov 2009 17:50:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290177
Log:
removed now obsolete NetWare hack since I fixed this
with Novell some longer time ago in their SDK header.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/filestat.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/filestat.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/filestat.c 2009-11-03
17:38:44 UTC (rev 290176)
+++ php/php-src/branches/PHP_5_2/ext/standard/filestat.c 2009-11-03
17:50:10 UTC (rev 290177)
@@ -386,7 +386,7 @@
}
/* }}} */
-#if !defined(WINDOWS)
+#if !defined(WINDOWS) && !defined(NETWARE)
static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
{
zval **filename, **group;
@@ -871,23 +871,11 @@
case FS_GROUP:
RETURN_LONG((long)ssb.sb.st_gid);
case FS_ATIME:
-#ifdef NETWARE
- RETURN_LONG((long)ssb.sb.st_atime.tv_sec);
-#else
RETURN_LONG((long)ssb.sb.st_atime);
-#endif
case FS_MTIME:
-#ifdef NETWARE
- RETURN_LONG((long)ssb.sb.st_mtime.tv_sec);
-#else
RETURN_LONG((long)ssb.sb.st_mtime);
-#endif
case FS_CTIME:
-#ifdef NETWARE
- RETURN_LONG((long)ssb.sb.st_ctime.tv_sec);
-#else
RETURN_LONG((long)ssb.sb.st_ctime);
-#endif
case FS_TYPE:
if (S_ISLNK(ssb.sb.st_mode)) {
RETURN_STRING("link", 1);
@@ -935,15 +923,9 @@
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_sb->st_size);
-#ifdef NETWARE
- MAKE_LONG_ZVAL_INCREF(stat_atime, (stat_sb->st_atime).tv_sec);
- MAKE_LONG_ZVAL_INCREF(stat_mtime, (stat_sb->st_mtime).tv_sec);
- MAKE_LONG_ZVAL_INCREF(stat_ctime, (stat_sb->st_ctime).tv_sec);
-#else
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_sb->st_atime);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_sb->st_mtime);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_sb->st_ctime);
-#endif
#ifdef HAVE_ST_BLKSIZE
MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_sb->st_blksize);
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
