Back- and front-port fixes for #55019

diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c
index 769ff7ddbb1520da81da0ea2a6f397dee8f817f6..719015fe64be77e8a3a3a9fe85a8758db305eca2 100755 (executable)
--- a/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c
@@ -677,7 +677,7 @@ PHP_FUNCTION(grapheme_stristr)
 /* }}} */
 
 /* {{{ grapheme_extract_charcount_iter - grapheme iterator for grapheme_extract MAXCHARS */
-inline int32_t
+static inline int32_t
 grapheme_extract_charcount_iter(UBreakIterator *bi, int32_t csize, unsigned char *pstr, int32_t str_len)
 {
        int pos = 0, prev_pos = 0;
@@ -714,7 +714,7 @@ grapheme_extract_charcount_iter(UBreakIterator *bi, int32_t csize, unsigned char
 /* }}} */
 
 /* {{{ grapheme_extract_bytecount_iter - grapheme iterator for grapheme_extract MAXBYTES */
-inline int32_t
+static inline int32_t
 grapheme_extract_bytecount_iter(UBreakIterator *bi, int32_t bsize, unsigned char *pstr, int32_t str_len)
 {
        int pos = 0, prev_pos = 0;
@@ -748,7 +748,7 @@ grapheme_extract_bytecount_iter(UBreakIterator *bi, int32_t bsize, unsigned char
 /* }}} */
 
 /* {{{ grapheme_extract_count_iter - grapheme iterator for grapheme_extract COUNT */
-inline int32_t
+static inline int32_t
 grapheme_extract_count_iter(UBreakIterator *bi, int32_t size, unsigned char *pstr, int32_t str_len)
 {
        int pos = 0, next_pos = 0;

diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c
index db5643164859912dd7315eb910fbd58b6eddaa80..92008554d47b169b53f3d7a695517739513c850b 100755 (executable)
--- a/ext/intl/grapheme/grapheme_util.c
+++ b/ext/intl/grapheme/grapheme_util.c
@@ -432,7 +432,7 @@ int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_a
 /* }}} */
 
 /* {{{ grapheme_count_graphemes */
-inline int32_t
+int32_t
 grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
 {
        int ret_len = 0;
@@ -456,7 +456,7 @@ grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
 /* }}} */
 
 /* {{{ grapheme_memnstr_grapheme: find needle in haystack using grapheme boundaries */
-inline int32_t
+int32_t
 grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle, int32_t needle_len, UChar *end)
 {
        UChar *p = haystack;

diff --git a/ext/intl/grapheme/grapheme_util.h b/ext/intl/grapheme/grapheme_util.h
index f8207cac5263d410fdcb16fe7a86c50908d617c5..675c6481b73d024c33a38a3702cc846ab79ce4a5 100755 (executable)
--- a/ext/intl/grapheme/grapheme_util.h
+++ b/ext/intl/grapheme/grapheme_util.h
@@ -36,10 +36,10 @@ int grapheme_ascii_check(const unsigned char *day, int32_t len);
 
 int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_array[], int boundary_array_len TSRMLS_DC );
 
-inline int32_t
+int32_t
 grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len);
 
-inline int32_t
+int32_t
 grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle, int32_t needle_len, UChar *end);
 
 inline void *grapheme_memrchr_grapheme(const void *s, int c, int32_t n);