svn: /php/php-src/ branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h trunk/ext/intl/grapheme/grapheme_string.c trunk/ext/intl/grapheme/grapheme_util.c
trunk/ext/intl/grapheme/grapheme_util.h
| From: | Gwynne Raskind | Date: | Sun, 07 Aug 2011 17:14:14 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h trunk/ext/intl/grapheme/grapheme_string.c trunk/ext/intl/grapheme/grapheme_util.c trunk/ext/intl/grapheme/grapheme_util.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65758@lists.php.net to get a copy of this message | ||
gwynne Sun, 07 Aug 2011 17:14:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314440
Log:
Back- and front-port fixes for #55019
Bug: https://bugs.php.net/55019 (Closed) undefined symbol:
grapheme_extract_count_iter in Unknown on line 0
Changed paths:
U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c
U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h
U php/php-src/trunk/ext/intl/grapheme/grapheme_string.c
U php/php-src/trunk/ext/intl/grapheme/grapheme_util.c
U php/php-src/trunk/ext/intl/grapheme/grapheme_util.h
Modified: php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c 2011-08-07 16:31:21 UTC (rev
314439)
+++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c 2011-08-07 17:14:14 UTC (rev
314440)
@@ -677,7 +677,7 @@
/* }}} */
/* {{{ 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_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_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;
Modified: php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c 2011-08-07 16:31:21 UTC (rev
314439)
+++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c 2011-08-07 17:14:14 UTC (rev
314440)
@@ -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_3/ext/intl/grapheme/grapheme_util.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h 2011-08-07 16:31:21 UTC (rev
314439)
+++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h 2011-08-07 17:14:14 UTC (rev
314440)
@@ -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);
Modified: php/php-src/trunk/ext/intl/grapheme/grapheme_string.c
===================================================================
--- php/php-src/trunk/ext/intl/grapheme/grapheme_string.c 2011-08-07 16:31:21 UTC (rev 314439)
+++ php/php-src/trunk/ext/intl/grapheme/grapheme_string.c 2011-08-07 17:14:14 UTC (rev 314440)
@@ -677,7 +677,7 @@
/* }}} */
/* {{{ 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_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_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;
Modified: php/php-src/trunk/ext/intl/grapheme/grapheme_util.c
===================================================================
--- php/php-src/trunk/ext/intl/grapheme/grapheme_util.c 2011-08-07 16:31:21 UTC (rev 314439)
+++ php/php-src/trunk/ext/intl/grapheme/grapheme_util.c 2011-08-07 17:14:14 UTC (rev 314440)
@@ -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/trunk/ext/intl/grapheme/grapheme_util.h
===================================================================
--- php/php-src/trunk/ext/intl/grapheme/grapheme_util.h 2011-08-07 16:31:21 UTC (rev 314439)
+++ php/php-src/trunk/ext/intl/grapheme/grapheme_util.h 2011-08-07 17:14:14 UTC (rev 314440)
@@ -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);