com php-src: adjusted zend_types.h: Zend/zend_types .h

From: Date: Wed, 16 Oct 2013 09:37:13 +0000
Subject: com php-src: adjusted zend_types.h: Zend/zend_types .h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73502@lists.php.net to get a copy of this message
Commit: 91058553c8860ce4d98381697d4c5809882f95e1 Author: Anatol Belski <ab@php.net> Thu, 18 Jul 2013 01:05:27 -0700 Parents: 631628baadd7926cb5c916e6cd0ef8ebf987a265 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=91058553c8860ce4d98381697d4c5809882f95e1 Log: adjusted zend_types.h Changed paths: M Zend/zend_types.h Diff: diff --git a/Zend/zend_types.h b/Zend/zend_types.h index d67d4b6..6f2097e 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -87,37 +87,7 @@ typedef struct _zend_object_value { const zend_object_handlers *handlers; } zend_object_value; -#ifdef ZEND_ENABLE_INT64 -# ifdef ZEND_WIN32 -# ifdef _WIN64 -typedef __int64 zend_int_t; -typedef unsigned __int64 zend_uint_t; -# define ZEND_INT_MAX _I64_MAX -# define ZEND_INT_MIN _I64_MIN -# define ZEND_UINT_MAX _UI64_MAX -# else -# error Cant enable 64 bit integers on non 64 bit platform -# endif -# else -# if defined(__LP64__) || defined(_LP64) -typedef int64_t zend_int_t; -typedef uint64_t zend_uint_t; -# define ZEND_INT_MAX INT64_MAX -# define ZEND_INT_MIN INT64_MIN -# define ZEND_UINT_MAX UINT64_MAX -# else -# error Cant enable 64 bit integers on non 64 bit platform -# endif -# endif -# define SIZEOF_ZEND_INT 8 -#else -typedef long zend_int_t; -typedef unsigned long zend_uint_t; -# define ZEND_INT_MAX LONG_MAX -# define ZEND_INT_MIN LONG_MIN -# define ZEND_UINT_MAX ULONG_MAX -# define SIZEOF_ZEND_INT SIZEOF_LONG -#endif +#include "zend_int.h" #endif /* ZEND_TYPES_H */

« previous php.cvs (#73502) next »