com php-src: fixed the rdev stat array member again for streams: ext/standard/file.c

From: Date: Wed, 27 Nov 2013 22:34:27 +0000
Subject: com php-src: fixed the rdev stat array member again for streams: ext/standard/file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74101@lists.php.net to get a copy of this message
Commit: 2c3cc2e10716c1aece232aaf748dc84897996895 Author: Anatol Belski <ab@php.net> Wed, 27 Nov 2013 23:34:27 +0100 Parents: ef52220617d9c9ab4d32ed3adeace06f513d22a9 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2c3cc2e10716c1aece232aaf748dc84897996895 Log: fixed the rdev stat array member again for streams Changed paths: M ext/standard/file.c Diff: diff --git a/ext/standard/file.c b/ext/standard/file.c index 2832beb..fde1afb 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1554,7 +1554,15 @@ PHP_NAMED_FUNCTION(php_if_fstat) MAKE_LONG_ZVAL_INCREF(stat_uid, stat_ssb.sb.st_uid); MAKE_LONG_ZVAL_INCREF(stat_gid, stat_ssb.sb.st_gid); #ifdef HAVE_ST_RDEV +# ifdef _WIN64 + if (stat_ssb.sb.st_rdev < ((_dev_t)-1)) { + MAKE_LONG_ZVAL_INCREF(stat_rdev, stat_ssb.sb.st_rdev); + } else { + MAKE_LONG_ZVAL_INCREF(stat_rdev, -1); + } +# else MAKE_LONG_ZVAL_INCREF(stat_rdev, stat_ssb.sb.st_rdev); +# endif #else MAKE_LONG_ZVAL_INCREF(stat_rdev, -1); #endif

« previous php.cvs (#74101) next »