summaryrefslogtreecommitdiff
path: root/Zend/zend_long.h
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-05-11 10:47:35 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-05-11 10:49:44 +0200
commit74f3bfc6eb7ec80287178e46bd5c269fd371ce5a (patch)
treebbeef8b8c1997851f07634f3df829cb2a52f5777 /Zend/zend_long.h
parent89b4a46d56117a1e794163f9b8016b0a23d5b9bd (diff)
downloadphp-git-74f3bfc6eb7ec80287178e46bd5c269fd371ce5a.tar.gz
Use supported printf format on Win64
Commit aaa1f90[1] dropped support for the custom `I` specifier, so we must no longer use it for `ZEND_ADDR_FMT`; otherwise there are segfaults when printing memory leaks, and maybe elsewhere. [1] <http://git.php.net/?p=php-src.git;a=commit;h=aaa1f90e3f90c24098fa55a7b868fdca0b89ee25>
Diffstat (limited to 'Zend/zend_long.h')
-rw-r--r--Zend/zend_long.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend_long.h b/Zend/zend_long.h
index 3b651e69d0..917b110b94 100644
--- a/Zend/zend_long.h
+++ b/Zend/zend_long.h
@@ -116,9 +116,7 @@ typedef int32_t zend_off_t;
static const char long_min_digits[] = LONG_MIN_DIGITS;
-#ifdef _WIN64
-# define ZEND_ADDR_FMT "0x%016I64x"
-#elif SIZEOF_SIZE_T == 4
+#if SIZEOF_SIZE_T == 4
# define ZEND_ADDR_FMT "0x%08zx"
#elif SIZEOF_SIZE_T == 8
# define ZEND_ADDR_FMT "0x%016zx"