Skip to content

Commit 876965d

Browse files
committed
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.
1 parent b65518f commit 876965d

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Zend/zend_types.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,8 @@ typedef enum {
6464
# endif
6565
#endif
6666

67-
/* XXX this won't work on X32 platform */
68-
#ifdef ZEND_ENABLE_ZVAL_LONG64
69-
typedef int64_t zend_intptr_t;
70-
typedef uint64_t zend_uintptr_t;
71-
#else
72-
typedef int32_t zend_intptr_t;
73-
typedef uint32_t zend_uintptr_t;
74-
#endif
67+
typedef intptr_t zend_intptr_t;
68+
typedef uintptr_t zend_uintptr_t;
7569

7670
typedef struct _zend_object_handlers zend_object_handlers;
7771
typedef struct _zend_class_entry zend_class_entry;

0 commit comments

Comments
 (0)