moriyoshi Wed Jul 16 02:30:49 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mbstring php_onig_compat.h
Removed files: /php-src/ext/mbstring/oniguruma php_onig_compat.h Modified files: /php-src/ext/mbstring config.m4 mbstring.c php_mbregex.c php_mbregex.h /php-src/ext/mbstring/oniguruma oniguruma.h Log: - MFH: Added a new configure option --with-onig=[DIR] that allows the extension to link to the external oniguruma library. - MFH: Prevent libmbfl files from being installed when --with-libmbfl is specified.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.11.2.4&r2=1.58.2.4.2.11.2.5&diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.4 php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.5 --- php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.4 Tue Jul 15 18:04:32 2008 +++ php-src/ext/mbstring/config.m4 Wed Jul 16 02:30:48 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.58.2.4.2.11.2.4 2008/07/15 18:04:32 moriyoshi Exp $ +dnl $Id: config.m4,v 1.58.2.4.2.11.2.5 2008/07/16 02:30:48 moriyoshi Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -26,6 +26,10 @@ PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS $1" ]) +AC_DEFUN([PHP_MBSTRING_ADD_INSTALL_HEADERS], [ + PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS $1" +]) + AC_DEFUN([PHP_MBSTRING_EXTENSION], [ PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS) PHP_SUBST(MBSTRING_SHARED_LIBADD) @@ -56,12 +60,22 @@ #include "$out" EOF done + PHP_MBSTRING_ADD_INSTALL_HEADERS([mbstring.h]) + PHP_INSTALL_HEADERS([ext/mbstring], [$PHP_MBSTRING_INSTALL_HEADERS]) ]) AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ if test "$PHP_MBREGEX" = "yes"; then - AC_CACHE_CHECK(for variable length prototypes and stdarg.h, cv_php_mbstring_stdarg, [ - AC_TRY_RUN([ + if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then + dnl + dnl Bundled oniguruma + dnl + if test "$PHP_MBREGEX_BACKTRACK" != "no"; then + AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack]) + fi + + AC_CACHE_CHECK(for variable length prototypes and stdarg.h, cv_php_mbstring_stdarg, [ + AC_TRY_RUN([ #include <stdarg.h> int foo(int x, ...) { va_list va; @@ -72,84 +86,119 @@ return 0; } int main() { return foo(10, "", 3.14); } - ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], [ - dnl cross-compile needs something here - case $host_alias in - *netware*) + ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], [ + dnl cross-compile needs something here + case $host_alias in + *netware*) cv_php_mbstring_stdarg=yes ;; - *) + *) cv_php_mbstring_stdarg=no ;; - esac + esac + ]) ]) - ]) - AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h]) - AC_CHECK_SIZEOF(int, 4) - AC_CHECK_SIZEOF(short, 2) - AC_CHECK_SIZEOF(long, 4) - AC_C_CONST - AC_HEADER_TIME - AC_FUNC_ALLOCA - AC_FUNC_MEMCMP + AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h]) + AC_CHECK_SIZEOF(int, 4) + AC_CHECK_SIZEOF(short, 2) + AC_CHECK_SIZEOF(long, 4) + AC_C_CONST + AC_HEADER_TIME + AC_FUNC_ALLOCA + AC_FUNC_MEMCMP + AC_CHECK_HEADER([stdarg.h], [ + AC_DEFINE([HAVE_STDARG_PROTOTYPES], [1], [Define to 1 if you have the <stdarg.h> header file.]) + ], []) + AC_DEFINE([PHP_ONIG_BUNDLED], [1], [Define to 1 if the bundled oniguruma is used]) + PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY]) + PHP_MBSTRING_ADD_BUILD_DIR([oniguruma]) + PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc]) + PHP_MBSTRING_ADD_INCLUDE([oniguruma]) + PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h]) + PHP_MBSTRING_ADD_SOURCES([ + oniguruma/regcomp.c + oniguruma/regerror.c + oniguruma/regexec.c + oniguruma/reggnu.c + oniguruma/regparse.c + oniguruma/regenc.c + oniguruma/regext.c + oniguruma/regsyntax.c + oniguruma/regtrav.c + oniguruma/regversion.c + oniguruma/st.c + oniguruma/enc/unicode.c + oniguruma/enc/ascii.c + oniguruma/enc/utf8.c + oniguruma/enc/euc_jp.c + oniguruma/enc/euc_tw.c + oniguruma/enc/euc_kr.c + oniguruma/enc/sjis.c + oniguruma/enc/iso8859_1.c + oniguruma/enc/iso8859_2.c + oniguruma/enc/iso8859_3.c + oniguruma/enc/iso8859_4.c + oniguruma/enc/iso8859_5.c + oniguruma/enc/iso8859_6.c + oniguruma/enc/iso8859_7.c + oniguruma/enc/iso8859_8.c + oniguruma/enc/iso8859_9.c + oniguruma/enc/iso8859_10.c + oniguruma/enc/iso8859_11.c + oniguruma/enc/iso8859_13.c + oniguruma/enc/iso8859_14.c + oniguruma/enc/iso8859_15.c + oniguruma/enc/iso8859_16.c + oniguruma/enc/koi8.c + oniguruma/enc/koi8_r.c + oniguruma/enc/big5.c + oniguruma/enc/utf16_be.c + oniguruma/enc/utf16_le.c + oniguruma/enc/utf32_be.c + oniguruma/enc/utf32_le.c + ]) + PHP_MBSTRING_ADD_INSTALL_HEADERS([oniguruma/oniguruma.h]) + else + dnl + dnl External oniguruma + dnl + if test ! -f "$PHP_ONIG/include/oniguruma.h"; then + AC_MSG_ERROR([oniguruma.h not found in $PHP_ONIG/include]) + fi + PHP_ADD_INCLUDE([$PHP_ONIG/include]) - AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support]) + PHP_CHECK_LIBRARY(onig, onig_init, [ + PHP_ADD_LIBRARY_WITH_PATH(onig, $PHP_ONIG/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with oniguruma. Please check config.log for more information.]) + ], [ + -L$PHP_ONIG/$PHP_LIBDIR + ]) - if test "$PHP_MBREGEX_BACKTRACK" != "no"; then - AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack]) + save_old_LDFLAGS=$LDFLAGS + PHP_EVAL_LIBLINE([$MBSTRING_SHARED_LIBADD], LDFLAGS) + AC_MSG_CHECKING([if oniguruma has an invalid entry for KOI8 encoding]) + AC_TRY_LINK([ +#include <oniguruma.h> + ], [ +return (int)(ONIG_ENCODING_KOI8 + 1); + ], [ + AC_MSG_RESULT([no]) + ], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1], [define to 1 if oniguruma has an invalid entry for KOI8 encoding]) + ]) + LDFLAGS=$save_old_LDFLAGS fi - PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY]) - PHP_MBSTRING_ADD_BUILD_DIR([oniguruma]) - PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc]) - PHP_MBSTRING_ADD_INCLUDE([oniguruma]) - PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h]) + PHP_MBSTRING_ADD_CFLAG([-DONIG_ESCAPE_UCHAR_COLLISION=1]) + PHP_MBSTRING_ADD_CFLAG([-DUChar=OnigUChar]) + + AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support]) PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c]) - PHP_MBSTRING_ADD_SOURCES([ - oniguruma/regcomp.c - oniguruma/regerror.c - oniguruma/regexec.c - oniguruma/reggnu.c - oniguruma/regparse.c - oniguruma/regenc.c - oniguruma/regext.c - oniguruma/regsyntax.c - oniguruma/regtrav.c - oniguruma/regversion.c - oniguruma/st.c - oniguruma/enc/unicode.c - oniguruma/enc/ascii.c - oniguruma/enc/utf8.c - oniguruma/enc/euc_jp.c - oniguruma/enc/euc_tw.c - oniguruma/enc/euc_kr.c - oniguruma/enc/sjis.c - oniguruma/enc/iso8859_1.c - oniguruma/enc/iso8859_2.c - oniguruma/enc/iso8859_3.c - oniguruma/enc/iso8859_4.c - oniguruma/enc/iso8859_5.c - oniguruma/enc/iso8859_6.c - oniguruma/enc/iso8859_7.c - oniguruma/enc/iso8859_8.c - oniguruma/enc/iso8859_9.c - oniguruma/enc/iso8859_10.c - oniguruma/enc/iso8859_11.c - oniguruma/enc/iso8859_13.c - oniguruma/enc/iso8859_14.c - oniguruma/enc/iso8859_15.c - oniguruma/enc/iso8859_16.c - oniguruma/enc/koi8.c - oniguruma/enc/koi8_r.c - oniguruma/enc/big5.c - oniguruma/enc/utf16_be.c - oniguruma/enc/utf16_le.c - oniguruma/enc/utf32_be.c - oniguruma/enc/utf32_le.c - oniguruma/enc/gb18030.c - ]) + PHP_MBSTRING_ADD_INSTALL_HEADERS([php_mbregex.h php_onig_compat.h]) fi ]) @@ -245,6 +294,7 @@ libmbfl/nls/nls_ua.c ]) PHP_MBSTRING_ADD_CFLAG([-DHAVE_CONFIG_H]) + PHP_MBSTRING_ADD_INSTALL_HEADERS([libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h]) else dnl dnl External libmfl @@ -290,6 +340,10 @@ [ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl base install directory [BUNDLED]], no, no) +PHP_ARG_WITH(onig, [for external oniguruma], +[ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. + If DIR is not set, the bundled oniguruma will be used], no, no) + if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) @@ -302,7 +356,6 @@ dnl libmbfl is required PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_EXTENSION - PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/oniguruma.h oniguruma/php_onig_compat.h]) fi # vim600: sts=2 sw=2 et http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.16&r2=1.224.2.22.2.25.2.17&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.16 php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.17 --- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.16 Sun Jul 13 01:34:21 2008 +++ php-src/ext/mbstring/mbstring.c Wed Jul 16 02:30:48 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.224.2.22.2.25.2.16 2008/07/13 01:34:21 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.224.2.22.2.25.2.17 2008/07/16 02:30:48 moriyoshi Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -1400,26 +1400,16 @@ if (MBSTRG(encoding_translation)) { php_info_print_table_row(2, "HTTP input encoding translation", "enabled"); } -#if defined(HAVE_MBREGEX) - { - char buf[32]; - php_info_print_table_row(2, "Multibyte (japanese) regex support", "enabled"); - snprintf(buf, sizeof(buf), "%d.%d.%d", - ONIGURUMA_VERSION_MAJOR,ONIGURUMA_VERSION_MINOR,ONIGURUMA_VERSION_TEENY); - php_info_print_table_row(2, "Multibyte regex (oniguruma) version", buf); -#ifdef USE_COMBINATION_EXPLOSION_CHECK - php_info_print_table_row(2, "Multibyte regex (oniguruma) backtrack check", "On"); -#else /* USE_COMBINATION_EXPLOSION_CHECK */ - php_info_print_table_row(2, "Multibyte regex (oniguruma) backtrack check", "Off"); -#endif /* USE_COMBINATION_EXPLOSION_CHECK */ - } -#endif php_info_print_table_end(); php_info_print_table_start(); php_info_print_table_header(1, "mbstring extension makes use of \"streamable kanji code filter and converter\", which is distributed under the GNU Lesser General Public License version 2.1."); php_info_print_table_end(); +#if HAVE_MBREGEX + PHP_MINFO(mb_regex)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); +#endif + DISPLAY_INI_ENTRIES(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.7&r2=1.53.2.1.2.4.2.8&diff_format=u Index: php-src/ext/mbstring/php_mbregex.c diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.7 php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.8 --- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.7 Fri Jul 11 13:50:43 2008 +++ php-src/ext/mbstring/php_mbregex.c Wed Jul 16 02:30:48 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.7 2008/07/11 13:50:43 jani Exp $ */ +/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.8 2008/07/16 02:30:48 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -105,6 +105,28 @@ } /* }}} */ +/* {{{ PHP_MINFO_FUNCTION(mb_regex) */ +PHP_MINFO_FUNCTION(mb_regex) +{ + char buf[32]; + php_info_print_table_start(); + php_info_print_table_row(2, "Multibyte (japanese) regex support", "enabled"); + snprintf(buf, sizeof(buf), "%d.%d.%d", + ONIGURUMA_VERSION_MAJOR, + ONIGURUMA_VERSION_MINOR, + ONIGURUMA_VERSION_TEENY); +#ifdef PHP_ONIG_BUNDLED +#ifdef USE_COMBINATION_EXPLOSION_CHECK + php_info_print_table_row(2, "Multibyte regex (oniguruma) backtrack check", "On"); +#else /* USE_COMBINATION_EXPLOSION_CHECK */ + php_info_print_table_row(2, "Multibyte regex (oniguruma) backtrack check", "Off"); +#endif /* USE_COMBINATION_EXPLOSION_CHECK */ +#endif /* PHP_BUNDLED_ONIG */ + php_info_print_table_row(2, "Multibyte regex (oniguruma) version", buf); + php_info_print_table_end(); +} +/* }}} */ + /* * encoding name resolver */ @@ -115,123 +137,181 @@ OnigEncoding code; } php_mb_regex_enc_name_map_t; -php_mb_regex_enc_name_map_t enc_name_map[] ={ +php_mb_regex_enc_name_map_t enc_name_map[] = { +#ifdef ONIG_ENCODING_EUC_JP { "EUC-JP\0EUCJP\0X-EUC-JP\0UJIS\0EUCJP\0EUCJP-WIN\0", ONIG_ENCODING_EUC_JP }, +#endif +#ifdef ONIG_ENCODING_UTF8 { "UTF-8\0UTF8\0", ONIG_ENCODING_UTF8 }, +#endif +#ifdef ONIG_ENCODING_UTF16_BE { "UTF-16\0UTF-16BE\0", ONIG_ENCODING_UTF16_BE }, +#endif +#ifdef ONIG_ENCODING_UTF16_LE { "UTF-16LE\0", ONIG_ENCODING_UTF16_LE }, +#endif +#ifdef ONIG_ENCODING_UTF32_BE { "UCS-4\0UTF-32\0UTF-32BE\0", ONIG_ENCODING_UTF32_BE }, +#endif +#ifdef ONIG_ENCODING_UTF32_LE { "UCS-4LE\0UTF-32LE\0", ONIG_ENCODING_UTF32_LE }, +#endif +#ifdef ONIG_ENCODING_SJIS { "SJIS\0CP932\0MS932\0SHIFT_JIS\0SJIS-WIN\0WINDOWS-31J\0", ONIG_ENCODING_SJIS }, +#endif +#ifdef ONIG_ENCODING_BIG5 { "BIG5\0BIG-5\0BIGFIVE\0CN-BIG5\0BIG-FIVE\0", ONIG_ENCODING_BIG5 }, +#endif +#ifdef ONIG_ENCODING_EUC_CN { "EUC-CN\0EUCCN\0EUC_CN\0GB-2312\0GB2312\0", ONIG_ENCODING_EUC_CN }, +#endif +#ifdef ONIG_ENCODING_EUC_TW { "EUC-TW\0EUCTW\0EUC_TW\0", ONIG_ENCODING_EUC_TW }, +#endif +#ifdef ONIG_ENCODING_EUC_KR { "EUC-KR\0EUCKR\0EUC_KR\0", ONIG_ENCODING_EUC_KR }, +#endif +#if defined(ONIG_ENCODING_KOI8) && !PHP_ONIG_BAD_KOI8_ENTRY { "KOI8\0KOI-8\0", ONIG_ENCODING_KOI8 }, +#endif +#ifdef ONIG_ENCODING_KOI8_R { "KOI8R\0KOI8-R\0KOI-8R\0", ONIG_ENCODING_KOI8_R }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_1 { "ISO-8859-1\0ISO8859-1\0ISO_8859_1\0ISO8859_1\0", ONIG_ENCODING_ISO_8859_1 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_2 { "ISO-8859-2\0ISO8859-2\0ISO_8859_2\0ISO8859_2\0", ONIG_ENCODING_ISO_8859_2 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_3 { "ISO-8859-3\0ISO8859-3\0ISO_8859_3\0ISO8859_3\0", ONIG_ENCODING_ISO_8859_3 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_4 { "ISO-8859-4\0ISO8859-4\0ISO_8859_4\0ISO8859_4\0", ONIG_ENCODING_ISO_8859_4 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_5 { "ISO-8859-5\0ISO8859-5\0ISO_8859_5\0ISO8859_5\0", ONIG_ENCODING_ISO_8859_5 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_6 { "ISO-8859-6\0ISO8859-6\0ISO_8859_6\0ISO8859_6\0", ONIG_ENCODING_ISO_8859_6 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_7 { "ISO-8859-7\0ISO8859-7\0ISO_8859_7\0ISO8859_7\0", ONIG_ENCODING_ISO_8859_7 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_8 { "ISO-8859-8\0ISO8859-8\0ISO_8859_8\0ISO8859_8\0", ONIG_ENCODING_ISO_8859_8 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_9 { "ISO-8859-9\0ISO8859-9\0ISO_8859_9\0ISO8859_9\0", ONIG_ENCODING_ISO_8859_9 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_10 { "ISO-8859-10\0ISO8859-10\0ISO_8859_10\0ISO8859_10\0", ONIG_ENCODING_ISO_8859_10 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_11 { "ISO-8859-11\0ISO8859-11\0ISO_8859_11\0ISO8859_11\0", ONIG_ENCODING_ISO_8859_11 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_13 { "ISO-8859-13\0ISO8859-13\0ISO_8859_13\0ISO8859_13\0", ONIG_ENCODING_ISO_8859_13 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_14 { "ISO-8859-14\0ISO8859-14\0ISO_8859_14\0ISO8859_14\0", ONIG_ENCODING_ISO_8859_14 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_15 { "ISO-8859-15\0ISO8859-15\0ISO_8859_15\0ISO8859_15\0", ONIG_ENCODING_ISO_8859_15 }, +#endif +#ifdef ONIG_ENCODING_ISO_8859_16 { "ISO-8859-16\0ISO8859-16\0ISO_8859_16\0ISO8859_16\0", ONIG_ENCODING_ISO_8859_16 }, +#endif +#ifdef ONIG_ENCODING_ASCII { "ASCII\0US-ASCII\0US_ASCII\0ISO646\0", ONIG_ENCODING_ASCII }, +#endif { NULL, ONIG_ENCODING_UNDEF } }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.h?r1=1.12.2.1.2.1.2.3&r2=1.12.2.1.2.1.2.4&diff_format=u Index: php-src/ext/mbstring/php_mbregex.h diff -u php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.3 php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.4 --- php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.3 Mon Jul 7 12:40:51 2008 +++ php-src/ext/mbstring/php_mbregex.h Wed Jul 16 02:30:48 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.3 2008/07/07 12:40:51 felipe Exp $ */ +/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.4 2008/07/16 02:30:48 moriyoshi Exp $ */ #ifndef _PHP_MBREGEX_H #define _PHP_MBREGEX_H @@ -25,7 +25,9 @@ #include "php.h" #include "zend.h" -#include "oniguruma/oniguruma.h" +#include "php_onig_compat.h" /* must come prior to the oniguruma header */ +#include "oniguruma.h" +#undef UChar /* {{{ PHP_MBREGEX_GLOBALS */ #define PHP_MBREGEX_GLOBALS \ @@ -82,6 +84,7 @@ PHP_MSHUTDOWN_FUNCTION(mb_regex); PHP_RINIT_FUNCTION(mb_regex); PHP_RSHUTDOWN_FUNCTION(mb_regex); +PHP_MINFO_FUNCTION(mb_regex); void _php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); void php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *syntax, OnigOptionType *prev_options, OnigSyntaxType **prev_syntax TSRMLS_DC); void _php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/oniguruma.h?r1=1.6.4.5.2.2&r2=1.6.4.5.2.3&diff_format=u Index: php-src/ext/mbstring/oniguruma/oniguruma.h diff -u php-src/ext/mbstring/oniguruma/oniguruma.h:1.6.4.5.2.2 php-src/ext/mbstring/oniguruma/oniguruma.h:1.6.4.5.2.3 --- php-src/ext/mbstring/oniguruma/oniguruma.h:1.6.4.5.2.2 Sun Jul 13 01:25:21 2008 +++ php-src/ext/mbstring/oniguruma/oniguruma.h Wed Jul 16 02:30:49 2008 @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include "php_onig_compat.h" +#include "../php_onig_compat.h" #ifdef __cplusplus extern "C" { http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_onig_compat.h?view=markup&rev=1.1 Index: php-src/ext/mbstring/php_onig_compat.h +++ php-src/ext/mbstring/php_onig_compat.h #ifndef _PHP_ONIG_COMPAT_H #define _PHP_ONIG_COMPAT_H #define re_pattern_buffer php_mb_re_pattern_buffer #define regex_t php_mb_regex_t #define re_registers php_mb_re_registers #endif /* _PHP_ONIG_COMPAT_H */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php