Make php_mb_is_mb_leadbyte() obsolete. It only works with double-byte chars.

# Sorry Marcus, it seems we were working simultaneously :)

1 files changed, 18 insertions, 8 deletions

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index d1ac666b73..37e4acdb69 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -58,10 +58,7 @@
 #include "mbfilter.h"
 #include "SAPI.h"
 
-#define PHP_MBSTRING_API 20020405
-
-PHPAPI char * php_mb_convert_encoding(char *input, size_t length, char *_to_encoding, char *_from_encodings, size_t *output_len TSRMLS_DC);
-PHPAPI int php_mb_check_encoding_list(const char *encoding_list TSRMLS_DC);
+#define PHP_MBSTRING_API 20021024
 
 #if HAVE_MBREGEX
 #include "php_mbregex.h"
@@ -109,10 +106,25 @@ PHP_FUNCTION(mb_decode_numericentity);
 PHP_FUNCTION(mb_send_mail);
 PHP_FUNCTION(mb_get_info);
 
-PHPAPI char *php_mb_strrchr(const char *s, char c TSRMLS_DC);
-PHPAPI int php_mb_is_leadbyte(const char *s TSRMLS_DC);
 PHPAPI int php_mb_encoding_translation(TSRMLS_D);
 
+PHPAPI char *php_mb_safe_strrchr_ex(const char *s, unsigned int c,
+                                    size_t nbytes, const mbfl_encoding *enc);
+PHPAPI char *php_mb_safe_strrchr(const char *s, unsigned int c,
+                                 size_t nbytes TSRMLS_DC);
+PHPAPI char *php_mb_strrchr(const char *s, char c TSRMLS_DC);
+
+PHPAPI char * php_mb_convert_encoding(char *input, size_t length,
+                                      char *_to_encoding,
+                                      char *_from_encodings,
+                                      size_t *output_len TSRMLS_DC);
+
+PHPAPI int php_mb_check_encoding_list(const char *encoding_list TSRMLS_DC);
+
+PHPAPI size_t php_mb_mbchar_bytes_ex(const char *s, const mbfl_encoding *enc);
+PHPAPI size_t php_mb_mbchar_bytes(const char *s TSRMLS_DC);
+
+
 ZEND_BEGIN_MODULE_GLOBALS(mbstring)
 	int language;
 	int current_language;
@@ -185,8 +197,6 @@ SAPI_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data);
 
 #define phpext_mbstring_ptr mbstring_module_ptr
 
-PHPAPI int php_mb_is_mb_leadbyte(const char *s TSRMLS_DC);
-
 #endif		/* _MBSTRING_H */
 
 /*