com php-src: Merge branch 'master' into str_size_and_int 64: Zend/zend.h Zend/zend_compile.c Zend/zend _generators.h Zend/zend_vm_def.h Zend/zend_vm
_execute.h ext/date/php_date.c ext/sockets/sockaddr _conv.c

Commit: 6b9396bd8ebe06567646bb77a78724474ac13ba8 Author: Anatol Belski <ab@php.net> Sun, 1 Dec 2013 12:31:48 +0100 Parents: 66a42402d9e6dfaed7a299cc814cd568c54a232c cb9000f15e2edbf36127ae54b253cbf53e6159d9 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b9396bd8ebe06567646bb77a78724474ac13ba8 Log: Merge branch 'master' into str_size_and_int64 Conflicts: ext/date/php_date.c Changed paths: MM Zend/zend.h MM Zend/zend_compile.c MM Zend/zend_generators.h MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/date/php_date.c MM ext/sockets/sockaddr_conv.c Diff: diff --cc Zend/zend.h index 9e3fc06,3ac559e..9d36851 --- a/Zend/zend.h +++ b/Zend/zend.h @@@ -691,10 -690,10 +691,10 @@@ END_EXTERN_C( #define ZEND_WRITE_EX(str, str_len) write_func((str), (str_len)) #define ZEND_PUTS(str) zend_write((str), strlen((str))) #define ZEND_PUTS_EX(str) write_func((str), strlen((str))) - #define ZEND_PUTC(c) zend_write(&(c), 1), (c) + #define ZEND_PUTC(c) zend_write(&(c), 1) BEGIN_EXTERN_C() -extern ZEND_API int (*zend_printf)(const char *format, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2); +extern ZEND_API zend_str_size_int (*zend_printf)(const char *format, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2); extern ZEND_API zend_write_func_t zend_write; extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC); extern ZEND_API void (*zend_block_interruptions)(void); diff --cc Zend/zend_generators.h index 60c24fd,d5f6101..07a21e2 --- a/Zend/zend_generators.h +++ b/Zend/zend_generators.h @@@ -49,9 -49,9 +49,9 @@@ typedef struct _zend_generator /* Current key */ zval *key; /* Variable to put sent value into */ - temp_variable *send_target; + zval **send_target; /* Largest used integer key for auto-incrementing keys */ - long largest_used_integer_key; + zend_int_t largest_used_integer_key; /* ZEND_GENERATOR_* flags */ zend_uchar flags; diff --cc ext/date/php_date.c index e7c2073,cd3bf74..b32fc41 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -3611,9 -3623,9 +3624,9 @@@ PHP_FUNCTION(date_diff zval *object1, *object2; php_date_obj *dateobj1, *dateobj2; php_interval_obj *interval; - long absolute = 0; + php_int_t absolute = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|i", &object1, date_ce_date, &object2, date_ce_date, &absolute) == FAILURE) { - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { ++ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|i", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { RETURN_FALSE; } dateobj1 = (php_date_obj *) zend_object_store_get_object(object1 TSRMLS_CC); @@@ -4397,9 -4408,9 +4410,9 @@@ PHP_METHOD(DatePeriod, __construct zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOl|l", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) { - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) { - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &isostr, &isostr_len, &options) == FAILURE) { + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOi|i", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) { - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOO|i", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_date, &options) == FAILURE) { ++ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOO|i", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) { + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "S|i", &isostr, &isostr_len, &options) == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments."); zend_restore_error_handling(&error_handling TSRMLS_CC); return;