diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/intl/common/common_error.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/intl/common/common_error.c')
| -rw-r--r-- | ext/intl/common/common_error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index 2db688ac71..f7b739555e 100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -48,7 +48,7 @@ PHP_FUNCTION( intl_get_error_message ) */ PHP_FUNCTION( intl_is_failure ) { - long err_code; + zend_long err_code; /* Parse parameters. */ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "l", @@ -70,7 +70,7 @@ PHP_FUNCTION( intl_is_failure ) */ PHP_FUNCTION( intl_error_name ) { - long err_code; + zend_long err_code; /* Parse parameters. */ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "l", |