From: Gwynne Raskind <gwynne@php.net>
Date: Sun, 7 Aug 2011 15:12:34 +0000 (+0000)
Subject: Fixes build issues with ext/intl. This appears to be related to bug #55019, but since... 
X-Git-Tag: php-5.4.0beta1~494
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8281417fd1193124c49fd72e0825fc60f603d83;p=php

Fixes build issues with ext/intl. This appears to be related to bug #55019, but since the functions in question are used elsewhere, the solution is to de-inline rather than to make them static inline.
---

diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c
index db56431648..92008554d4 100755
--- 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 f8207cac52..675c6481b7 100755
--- 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);