From 2bfd9402b19b68e67b422e57d9ba167f2931d335 Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Wed, 3 Jul 2002 22:14:14 +0000 Subject: [PATCH] fixed ZTS build and added language check. --- ext/mbstring/mbstring.c | 5 +++-- ext/mbstring/mbstring.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 9d9a5cf3b4..665e72b308 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1145,7 +1145,7 @@ SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler) #define IS_SJIS1(c) ((((c)>=0x81 && (c)<=0x9f) || ((c)>=0xe0 && (c)<=0xf5)) ? 1 : 0) #define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0) -char *mbstr_strrchr(const char *s, char c){ +char *mbstr_strrchr(const char *s, char c TSRMLS_DC){ unsigned char *p = (unsigned char *)s, *last = NULL; while(*p++) { if (*p == c) { @@ -1154,7 +1154,8 @@ char *mbstr_strrchr(const char *s, char c){ if (*p == '\0'){ break; } - if (IS_SJIS1(*p) && IS_SJIS2(*(p+1))) { + if (MBSTRG(current_language) == mbfl_no_language_japanese + && IS_SJIS1(*p) && IS_SJIS2(*(p+1))) { p++; } } diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index 708f6def88..6925980275 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -117,7 +117,7 @@ PHP_FUNCTION(mb_ereg_search_setpos); int php_mbregex_name2mbctype(const char *pname); #endif -char *mbstr_strrchr(const char *s, char c); +char *mbstr_strrchr(const char *s, char c TSRMLS_DC); ZEND_BEGIN_MODULE_GLOBALS(mbstring) int language; -- 2.50.1