clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source 
* PHP-7.1:
  Fixed bad merge
This commit is contained in:
Dmitry Stogov 2016-12-01 16:22:32 +03:00
commit 0a22c59c2b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/intl/grapheme/grapheme_string.c
View File

@ -774,9 +774,9 @@ PHP_FUNCTION(grapheme_extract)
{ {
char *str, *pstr; char *str, *pstr;
UText ut = UTEXT_INITIALIZER; UText ut = UTEXT_INITIALIZER;
int str_len; size_t str_len;
long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */ zend_long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */
long lstart = 0; /* starting position in str in bytes */ zend_long lstart = 0; /* starting position in str in bytes */
int32_t start = 0; int32_t start = 0;
zend_long extract_type = GRAPHEME_EXTRACT_TYPE_COUNT; zend_long extract_type = GRAPHEME_EXTRACT_TYPE_COUNT;
UErrorCode status; UErrorCode status;