Remaned the functions for consistency

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index d325be628bc34bae39386f4cf9676dffc225494c..4668547155e6c8c8d15783f17b94c724ae4c79f3 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1495,7 +1495,7 @@ char *mbstr_strrchr(const char *s, char c TSRMLS_DC){
        return last;
 }
 
-int mbstr_is_mb_leadbyte(const char *s TSRMLS_DC){
+PHPAPI int php_mb_is_mb_leadbyte(const char *s TSRMLS_DC){
        unsigned char *p = (unsigned char *)s;
        if (MBSTRG(current_language) == mbfl_no_language_japanese 
                && IS_SJIS1(*p) && IS_SJIS2(*(p+1))){
@@ -3457,7 +3457,7 @@ PHP_FUNCTION(mb_get_info)
 }
 /* }}} */
 
-PHPAPI int mbstr_encoding_translation(TSRMLS_D) 
+PHPAPI int php_mb_encoding_translation(TSRMLS_D) 
 {
        return MBSTRG(encoding_translation);
 }

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index d553ff2ee27ff387c2d282c558e54aa4a7f8f0f0..99c98ef673c47555aeb4b8e7d10cd7593a8de2a0 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -110,8 +110,8 @@ PHP_FUNCTION(mb_send_mail);
 PHP_FUNCTION(mb_get_info);
 
 char *mbstr_strrchr(const char *s, char c TSRMLS_DC);
-int mbstr_is_mb_leadbyte(const char *s TSRMLS_DC);
-PHPAPI int mbstr_encoding_translation(TSRMLS_D);
+int php_mb_is_leadbyte(const char *s TSRMLS_DC);
+PHPAPI int php_mb_encoding_translation(TSRMLS_D);
 
 ZEND_BEGIN_MODULE_GLOBALS(mbstring)
        int language;

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 3ce818e211b5e6481d142c2e13771de248051075..12e9dd658cc6530f4cbd9ab6463878c1564e4536 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -512,8 +512,8 @@ static char *substring_conf(char *start, int len, char quote TSRMLS_DC)
                } else {
                        *resp++ = start[i];
 #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
-                       if (mbstr_encoding_translation(TSRMLS_C) && 
-                               mbstr_is_mb_leadbyte(start+i TSRMLS_CC)) {
+                       if (php_mb_encoding_translation(TSRMLS_C) && 
+                               php_mb_is_mb_leadbyte(start+i TSRMLS_CC)) {
                                *resp++ = start[++i];
                        }
 #endif
@@ -903,7 +903,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
                        }
 
 #if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
-                       if (mbstr_encoding_translation(TSRMLS_C)) {
+                       if (php_mb_encoding_translation(TSRMLS_C)) {
                                s = mbstr_strrchr(filename, '\\' TSRMLS_CC);
                        } else {
                                s = strrchr(filename, '\\');