diff options
| author | Anatol Belski <ab@php.net> | 2014-08-16 17:31:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-16 17:31:40 +0200 |
| commit | 864172d9a49a6201513d83c06b77b5d309dc50ab (patch) | |
| tree | 6aa4b3249a59aa8f3b21a06cb28a1fc2f0f5dae6 /ext/standard/basic_functions.c | |
| parent | 54906c760fb578079b6783a2aa4184372a3179d3 (diff) | |
| download | php-git-864172d9a49a6201513d83c06b77b5d309dc50ab.tar.gz | |
further fixes to ext/standard and zend
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 605d9ddc7d..4137823257 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -395,7 +395,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() - + ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge_recursive, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ ZEND_ARG_VARIADIC_INFO(0, arrays) @@ -4428,7 +4428,7 @@ PHP_FUNCTION(usleep) Delay for a number of seconds and nano seconds */ PHP_FUNCTION(time_nanosleep) { - php_int_t tv_sec, tv_nsec; + long tv_sec, tv_nsec; struct timespec php_req, php_rem; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec) == FAILURE) { |