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.
php · Aug 24, 2018 · 3ceecaa · 3ceecaa
1 parent 6136a20
commit 3ceecaa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -877,7 +877,7 @@ static int php_stream_ftp_url_stat(php_stream_wrapper *wrapper, const char *url,
 	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
@@ -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
@@ -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