1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
This commit is contained in:
Dmitry Stogov
2016-12-01 15:50:19 +03:00
+3 -3
View File
@@ -774,9 +774,9 @@ PHP_FUNCTION(grapheme_extract)
{
char *str, *pstr;
UText ut = UTEXT_INITIALIZER;
size_t str_len;
zend_long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */
zend_long lstart = 0; /* starting position in str in bytes */
int str_len;
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 */
int32_t start = 0;
zend_long extract_type = GRAPHEME_EXTRACT_TYPE_COUNT;
UErrorCode status;