cvs: ZendEngine2 / Zend.m4 zend_highlight.c zend_multibyte.c zend_multibyte.h

sniper Thu Aug 11 20:01:47 2005 EDT Removed files: /ZendEngine2 zend_multibyte.c zend_multibyte.h Modified files: /ZendEngine2 Zend.m4 zend_highlight.c Log: Nuked unneeded multibyte stuff http://cvs.php.net/diff.php/ZendEngine2/Zend.m4?r1=1.59&r2=1.60&ty=u Index: ZendEngine2/Zend.m4 diff -u ZendEngine2/Zend.m4:1.59 ZendEngine2/Zend.m4:1.60 --- ZendEngine2/Zend.m4:1.59 Thu Aug 11 19:34:54 2005 +++ ZendEngine2/Zend.m4 Thu Aug 11 20:01:44 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: Zend.m4,v 1.59 2005/08/11 23:34:54 andrei Exp $ +dnl $Id: Zend.m4,v 1.60 2005/08/12 00:01:44 sniper Exp $ dnl dnl This file contains Zend specific autoconf functions. dnl @@ -160,16 +160,6 @@ ZEND_MEMORY_LIMIT=no ]) -dnl AC_ARG_ENABLE(zend-multibyte, -dnl [ --enable-zend-multibyte Compile with zend multibyte support], [ -dnl ZEND_MULTIBYTE=$enableval -dnl ],[ -dnl ZEND_MULTIBYTE=no -dnl ]) - -dnl Unicode PHP doesn't need ZEND_MULTIBYTE -ZEND_MULTIBYTE=no - AC_MSG_CHECKING([virtual machine dispatch method]) AC_MSG_RESULT($PHP_ZEND_VM) @@ -188,9 +178,6 @@ AC_MSG_CHECKING(whether to enable Zend debugging) AC_MSG_RESULT($ZEND_DEBUG) -AC_MSG_CHECKING(whether to enable Zend multibyte) -AC_MSG_RESULT($ZEND_MULTIBYTE) - case $PHP_ZEND_VM in SWITCH) AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method]) @@ -237,10 +224,6 @@ AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit]) fi -if test "$ZEND_MULTIBYTE" = "yes"; then - AC_DEFINE(ZEND_MULTIBYTE, 1, [ ]) -fi - changequote({,}) if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then INLINE_CFLAGS=echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*// http://cvs.php.net/diff.php/ZendEngine2/zend_highlight.c?r1=1.50&r2=1.51&ty=u Index: ZendEngine2/zend_highlight.c diff -u ZendEngine2/zend_highlight.c:1.50 ZendEngine2/zend_highlight.c:1.51 --- ZendEngine2/zend_highlight.c:1.50 Thu Aug 11 19:34:57 2005 +++ ZendEngine2/zend_highlight.c Thu Aug 11 20:01:44 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_highlight.c,v 1.50 2005/08/11 23:34:57 andrei Exp $ */ +/* $Id: zend_highlight.c,v 1.51 2005/08/12 00:01:44 sniper Exp $ */ #include "zend.h" #include <zend_language_parser.h> @@ -59,17 +59,6 @@ { const char *ptr=s, *end=s+len; -#ifdef ZEND_MULTIBYTE - char *filtered; - int filtered_len; - - if (LANG_SCNG(output_filter)) { - LANG_SCNG(output_filter)(&filtered, &filtered_len, s, len TSRMLS_CC); - ptr = filtered; - end = filtered + filtered_len; - } -#endif /* ZEND_MULTIBYTE */ - while (ptr<end) { if (*ptr==' ') { do { @@ -79,12 +68,6 @@ zend_html_putc(*ptr++); } } - -#ifdef ZEND_MULTIBYTE - if (LANG_SCNG(output_filter)) { - efree(filtered); - } -#endif /* ZEND_MULTIBYTE */ }