com php-src: Use intptr_t for zend_intptr_t typedef : Zend/zend_types.h

From: Date: Thu, 16 Oct 2014 10:42:23 +0000
Subject: com php-src: Use intptr_t for zend_intptr_t typedef : Zend/zend_types.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82368@lists.php.net to get a copy of this message
Commit: 876965d20a53d06fbe61e887f6f0c74b6a36d5ec Author: Nikita Popov <nikic@php.net> Thu, 16 Oct 2014 12:17:20 +0200 Parents: b65518faf3307711c6804dde799aee7541413829 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=876965d20a53d06fbe61e887f6f0c74b6a36d5ec Log: 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. Changed paths: M Zend/zend_types.h Diff: diff --git a/Zend/zend_types.h b/Zend/zend_types.h index eb7154f..383f77c 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;

« previous php.cvs (#82368) next »