diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-16 12:17:20 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-16 12:42:23 +0200 |
| commit | 876965d20a53d06fbe61e887f6f0c74b6a36d5ec (patch) | |
| tree | 197dd185f320db3252cb5ee72111df09c57b4cfe | |
| parent | b65518faf3307711c6804dde799aee7541413829 (diff) | |
| download | php-git-876965d20a53d06fbe61e887f6f0c74b6a36d5ec.tar.gz | |
Use intptr_t for zend_intptr_t typedef
Current code doesn't work for 64bit zend_long with 32bit pointers.
If intptr_t isn't defined on some platform, we should add it to
our php_stdint.h header.
| -rw-r--r-- | Zend/zend_types.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Zend/zend_types.h b/Zend/zend_types.h index eb7154f293..383f77caa4 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -64,14 +64,8 @@ typedef enum { # endif #endif -/* XXX this won't work on X32 platform */ -#ifdef ZEND_ENABLE_ZVAL_LONG64 -typedef int64_t zend_intptr_t; -typedef uint64_t zend_uintptr_t; -#else -typedef int32_t zend_intptr_t; -typedef uint32_t zend_uintptr_t; -#endif +typedef intptr_t zend_intptr_t; +typedef uintptr_t zend_uintptr_t; typedef struct _zend_object_handlers zend_object_handlers; typedef struct _zend_class_entry zend_class_entry; |