com php-src: reworked compat.h: compat/compat.h

From: Date: Mon, 13 Jan 2014 03:08:46 +0000
Subject: com php-src: reworked compat.h: compat/compat.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75574@lists.php.net to get a copy of this message
Commit: 4560d412bb891933cb092e59a2034fd2e0ddfc03 Author: Anatol Belski <ab@php.net> Mon, 13 Jan 2014 04:08:46 +0100 Parents: 2487493f83cb71b0684a70799c5c907f8b4158ca Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4560d412bb891933cb092e59a2034fd2e0ddfc03 Log: reworked compat.h Changed paths: M compat/compat.h Diff: diff --git a/compat/compat.h b/compat/compat.h index 66b45f1..0ef54f1 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -29,7 +29,7 @@ typedef long zend_int_t; typedef unsigned long zend_uint_t; typedef long zend_off_t; -typedef size_t zend_size_t; +typedef int zend_size_t; typedef struct stat zend_stat_t; # define ZEND_INT_MAX LONG_MAX # define ZEND_INT_MIN LONG_MIN @@ -75,11 +75,13 @@ typedef struct stat zend_stat_t; #define PHP_UINT_MAX ZEND_UINT_MAX #define PHP_SIZE_MAX ZEND_SIZE_MAX -# define ZEND_SIZE_MAX ZEND_SIZE_MAX_LONG -# define ZEND_SIZE_MAX ZEND_SIZE_MAX_INT # define MAX_LENGTH_OF_ZEND_INT MAX_LENGTH_OF_LONG # define Z_STRSIZE Z_STRLEN +# define Z_STRSIZE_P Z_STRLEN_P +# define Z_STRSIZE_PP Z_STRLEN_PP # define Z_IVAL Z_LVAL +# define Z_IVAL_P Z_LVAL_P +# define Z_IVAL_PP Z_LVAL_PP # define IS_INT IS_LONG # define ZVAL_INT ZVAL_LONG # define RETVAL_INT RETVAL_LONG @@ -129,15 +131,6 @@ typedef struct stat zend_stat_t; # define cfg_get_int cfg_get_long # define pdo_attr_ival pdo_attr_lval - -# define zend_parse_parameters_comp zend_parse_parameters -# define zend_parse_method_parameters_comp zend_parse_method_parameters - -#else - -# define zend_parse_parameters_comp zend_parse_parameters -# define zend_parse_method_parameters_comp zend_parse_method_parameters - #endif #endif /* PHP_SIZE_INT_COMPAT_H */

« previous php.cvs (#75574) next »