svn: /php/php-src/branches/PHP_5_4/ext/intl/grapheme/ grapheme_util.c grapheme_util.h
| From: | Gwynne Raskind | Date: | Sun, 07 Aug 2011 15:12:34 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_4/ext/intl/grapheme/ grapheme_util.c grapheme_util.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65750@lists.php.net to get a copy of this message | ||
gwynne Sun, 07 Aug 2011 15:12:34 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314433
Log:
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.
Bug: https://bugs.php.net/55019 (Assigned) undefined
symbol: grapheme_extract_count_iter in Unknown on line 0
Changed paths:
U php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c
U php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h
Modified: php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c 2011-08-07 15:09:42 UTC (rev
314432)
+++ php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c 2011-08-07 15:12:34 UTC (rev
314433)
@@ -432,7 +432,7 @@
/* }}} */
/* {{{ 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_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;
Modified: php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h 2011-08-07 15:09:42 UTC (rev
314432)
+++ php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h 2011-08-07 15:12:34 UTC (rev
314433)
@@ -36,10 +36,10 @@
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);