com php-src: temporary fix for win64: Zend/zend_alloc.c
| From: | Anatol Belski | Date: | Tue, 26 Aug 2014 14:27:14 +0000 |
| Subject: | com php-src: temporary fix for win64: Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81126@lists.php.net to get a copy of this message | ||
Commit: d285e346daad8b630c71cd599493825e66056181
Author: Anatol Belski <ab@php.net> Tue, 26 Aug 2014 16:27:14 +0200
Parents: 661f90d4d1f83e7dc1258befa9741fec32649b45
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d285e346daad8b630c71cd599493825e66056181
Log:
temporary fix for win64
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 706290a..7d7a481 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -131,7 +131,8 @@
#endif
typedef uint32_t zend_mm_page_info; /* 4-byte integer */
-typedef zend_ulong zend_mm_bitset; /* 4-byte or 8-byte integer */
+/* XXX temporary fix crash on bitset computing on win64 */
+typedef unsigned long zend_mm_bitset; /* 4-byte or 8-byte integer */
#define ZEND_MM_ALIGNED_OFFSET(size, alignment) \
(((size_t)(size)) & ((alignment) - 1))