Fixed bad merge

diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c
index c9b2d0e8ab504bb27142f754b8f43dac450eb1b1..f69500429d7e0ae2d8aad28bb38337348d9db05a 100644 (file)
--- a/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c
@@ -774,9 +774,9 @@ PHP_FUNCTION(grapheme_extract)
 {
        char *str, *pstr;
        UText ut = UTEXT_INITIALIZER;
-       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 */
+       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 */
        int32_t start = 0;
        zend_long extract_type = GRAPHEME_EXTRACT_TYPE_COUNT;
        UErrorCode status;