com php-src: prepare for zend_size_t: Zend/zend_types .h main/php.h

Commit: 6d938321ffc43a343b2afcee70d921cc931752d8 Author: Anatol Belski <ab@php.net> Wed, 18 Dec 2013 14:22:47 -0800 Parents: df7db6519c655e156ff5746d262e63d2566f44eb Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d938321ffc43a343b2afcee70d921cc931752d8 Log: prepare for zend_size_t Changed paths: M Zend/zend_types.h M main/php.h Diff: diff --git a/Zend/zend_types.h b/Zend/zend_types.h index ea3f299..851537b 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -31,32 +31,19 @@ typedef unsigned long zend_ulong; typedef unsigned short zend_ushort; #ifdef ZEND_ENABLE_INT64 -# define zend_str_size_int zend_str_size -# define zend_str_size_uint zend_str_size -# define zend_str_size_size_t zend_str_size -# define zend_str_size_long zend_str_size # ifdef ZEND_WIN32 -# define ZEND_SIZE_MAX_LONG _UI64_MAX -# define ZEND_SIZE_MAX_INT _UI64_MAX +# define ZEND_SIZE_MAX _UI64_MAX # else -# define ZEND_SIZE_MAX_LONG SIZE_MAX -# define ZEND_SIZE_MAX_INT SIZE_MAX +# define ZEND_SIZE_MAX SIZE_MAX # endif -typedef size_t zend_str_size; #else -# define zend_str_size_int int -# define zend_str_size_uint unsigned int -# define zend_str_size_size_t size_t -# define zend_str_size_long long # if defined(ZEND_WIN32) -# define ZEND_SIZE_MAX_LONG _UI32_MAX -# define ZEND_SIZE_MAX_INT _UI32_MAX +# define ZEND_SIZE_MAX _UI32_MAX # else -# define ZEND_SIZE_MAX_LONG LONG_MAX -# define ZEND_SIZE_MAX_INT INT_MAX +# define ZEND_SIZE_MAX SIZE_MAX # endif -typedef int zend_str_size; #endif +typedef size_t zend_size_t; #define HAVE_ZEND_LONG64 #ifdef ZEND_WIN32 diff --git a/main/php.h b/main/php.h index bdafba0..ddb30bf 100644 --- a/main/php.h +++ b/main/php.h @@ -446,13 +446,13 @@ END_EXTERN_C() #endif #endif /* !XtOffsetOf */ +#define php_size_t zend_size_t #define php_int_t zend_int_t #define php_uint_t zend_uint_t #define PHP_INT_MAX ZEND_INT_MAX #define PHP_INT_MIN ZEND_INT_MIN #define PHP_UINT_MAX ZEND_UINT_MAX -#define PHP_SIZE_MAX_LONG ZEND_SIZE_MAX_LONG -#define PHP_SIZE_MAX_INT ZEND_SIZE_MAX_INT +#define PHP_SIZE_MAX ZEND_SIZE_MAX #endif