com php-src: Replace HAVE_ST_BLOCKS with HAVE_STRUCT _STAT_ST_BLOCKS: ext/phar/func_interceptors.c e xt/standard/file.c ext/standard/filestat.c
ext/standard /ftp_fopen_wrapper.c main/streams/userspace.c win 32/build/config.w32.h.in
| From: | Christoph Michael Becker | Date: | Fri, 24 Aug 2018 16:33:23 +0000 |
| Subject: | com php-src: Replace HAVE_ST_BLOCKS with HAVE_STRUCT _STAT_ST_BLOCKS: ext/phar/func_interceptors.c e xt/standard/file.c ext/standard/filestat.c ext/standard /ftp_fopen_wrapper.c main/streams/userspace.c win 32/build/config.w32.h.in |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102890@lists.php.net to get a copy of this message | ||
Commit: 3ceecaa9a014c0990c49bd2db1dc16db01254e4b
Author: Peter Kokot <peterkokot@gmail.com> Fri, 24 Aug 2018 00:33:02 +0200
Committer: Christoph M. Becker <cmbecker69@gmx.de> Fri, 24 Aug 2018 18:33:23 +0200
Parents: 6136a20544a3f8a116bb38e404dadd500006b134
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ceecaa9a014c0990c49bd2db1dc16db01254e4b
Log:
Replace HAVE_ST_BLOCKS with HAVE_STRUCT_STAT_ST_BLOCKS
Since Autoconf 2.50+ macro AC_STRUCT_ST_BLOCKS defines the new
HAVE_STRUCT_STAT_ST_BLOCKS symbol and has deprecated the previous
HAVE_ST_BLOCKS.
PHP 5.3 required Autoconf 2.13 (released in 1999) or newer, since PHP
5.4 the autoconf 2.59 (released in 2003) or newer was required, and
since PHP 7.2, autoconf 2.64 (released in 2008) or newer is required.
Changed paths:
M ext/phar/func_interceptors.c
M ext/standard/file.c
M ext/standard/filestat.c
M ext/standard/ftp_fopen_wrapper.c
M main/streams/userspace.c
M win32/build/config.w32.h.in
Diff:
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index d9d8b04..eb6dff8 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -540,7 +540,7 @@ static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value)
#else
ZVAL_LONG(&stat_blksize,-1);
#endif
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
ZVAL_LONG(&stat_blocks, stat_sb->st_blocks);
#else
ZVAL_LONG(&stat_blocks,-1);
diff --git a/ext/standard/file.c b/ext/standard/file.c
index ef2234d..4aae502 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1616,7 +1616,7 @@ PHP_NAMED_FUNCTION(php_if_fstat)
#else
ZVAL_LONG(&stat_blksize,-1);
#endif
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
ZVAL_LONG(&stat_blocks, stat_ssb.sb.st_blocks);
#else
ZVAL_LONG(&stat_blocks,-1);
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 220b593..68644ac 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -948,7 +948,7 @@ PHPAPI void php_stat(const char *filename, size_t filename_length, int type, zva
#else
ZVAL_LONG(&stat_blksize,-1);
#endif
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
ZVAL_LONG(&stat_blocks, stat_sb->st_blocks);
#else
ZVAL_LONG(&stat_blocks,-1);
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 8628e9b..e9bedc2 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -877,7 +877,7 @@ mdtm_error:
ssb->sb.st_rdev = -1;
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
ssb->sb.st_blksize = 4096; /* Guess since FTP won't expose this information */
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
ssb->sb.st_blocks = (int)((4095 + ssb->sb.st_size) / ssb->sb.st_blksize); /* emulate ceil
*/
#endif
#endif
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index e69db52..5c144f2 100644
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -865,7 +865,7 @@ static int statbuf_from_array(zval *array, php_stream_statbuf *ssb)
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
STAT_PROP_ENTRY(blksize);
#endif
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
STAT_PROP_ENTRY(blocks);
#endif
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index ef72e68..7434209 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -67,7 +67,7 @@
#undef HAVE_SYS_TIME_H
#define HAVE_SIGNAL_H 1
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-#undef HAVE_ST_BLOCKS
+#undef HAVE_STRUCT_STAT_ST_BLOCKS
#define HAVE_STRUCT_STAT_ST_RDEV 1
#define HAVE_UTIME_NULL 1
#define HAVE_VPRINTF 1