summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Hirokawa <hirokawa@php.net>2002-07-03 22:14:14 +0000
committerRui Hirokawa <hirokawa@php.net>2002-07-03 22:14:14 +0000
commit2bfd9402b19b68e67b422e57d9ba167f2931d335 (patch)
tree69b9411b96ab081d1d04c60ce7625e612cdf262b
parentae430bfba8bbf879f066d73312f81bd075b1015f (diff)
downloadphp-git-2bfd9402b19b68e67b422e57d9ba167f2931d335.tar.gz
fixed ZTS build and added language check.
-rw-r--r--ext/mbstring/mbstring.c5
-rw-r--r--ext/mbstring/mbstring.h2
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;