subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ext\/mbstring config.m4"

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

2008-07-15 Thread Moriyoshi Koizumi

moriyoshi   Tue Jul 15 18:07:42 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
  Log:
  * MFH: indentation fix only.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.11r2=1.58.2.4.2.12diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.11 
php-src/ext/mbstring/config.m4:1.58.2.4.2.12
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.11Tue Sep 18 21:35:39 2007
+++ php-src/ext/mbstring/config.m4  Tue Jul 15 18:07:42 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.11 2007/09/18 21:35:39 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.12 2008/07/15 18:07:42 moriyoshi Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -72,19 +72,17 @@
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
-;;
-esac
-]
-)
+  ], [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
+  ])
 ])
 
 AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h 
sys/times.h stdarg.h])
@@ -98,7 +96,6 @@
 
 AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])
 
-
 if test $PHP_MBREGEX_BACKTRACK != no; then
   AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check 
multibyte regex backtrack])
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/oniguruma php_onig_compat.h

2007-09-18 Thread Rui Hirokawa

hirokawaTue Sep 18 21:35:39 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/oniguruma php_onig_compat.h 
  Log:
  MFH: fixed bug #42502 va_* cannot detect.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.10r2=1.58.2.4.2.11diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.10 
php-src/ext/mbstring/config.m4:1.58.2.4.2.11
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.10Tue Jul 31 12:23:50 2007
+++ php-src/ext/mbstring/config.m4  Tue Sep 18 21:35:39 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.10 2007/07/31 12:23:50 tony2001 Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.11 2007/09/18 21:35:39 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -87,7 +87,7 @@
 )
 ])
 
-AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h 
sys/times.h])
+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)
@@ -96,9 +96,6 @@
 AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
 
-if test $cv_php_mbstring_stdarg = yes; then
-  AC_DEFINE([HAVE_STDARG_PROTOTYPES], 1, [Define if stdarg.h is available])
-fi
 AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])
 
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/php_onig_compat.h?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/mbstring/oniguruma/php_onig_compat.h
diff -u php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.2 
php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.2.4.1
--- php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.2Mon Feb 21 
09:43:55 2005
+++ php-src/ext/mbstring/oniguruma/php_onig_compat.hTue Sep 18 21:35:39 2007
@@ -5,4 +5,10 @@
 #define regex_t php_mb_regex_t
 #define re_registersphp_mb_re_registers
 
+#ifdef HAVE_STDARG_H
+#ifndef HAVE_STDARG_PROTOTYPES
+#define HAVE_STDARG_PROTOTYPES 1
+#endif
+#endif
+
 #endif /* _PHP_MBREGEX_COMPAT_H */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

2007-07-31 Thread Antony Dovgal

tony2001Tue Jul 31 12:23:50 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
  Log:
  fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.9r2=1.58.2.4.2.10diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.9 
php-src/ext/mbstring/config.m4:1.58.2.4.2.10
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.9 Tue Jul  3 17:25:33 2007
+++ php-src/ext/mbstring/config.m4  Tue Jul 31 12:23:50 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.9 2007/07/03 17:25:33 sniper Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.10 2007/07/31 12:23:50 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -270,7 +270,7 @@
 ],[
   AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more 
information.])
 ], [
-  -LPHP_LIBMBFL/$PHP_LIBDIR
+  -L$PHP_LIBMBFL/$PHP_LIBDIR
 ])
   fi
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/libmbfl/filters Makefile.am mbfilter_euc_jp_win.c mbfilter_iso2022_jp_ms.c mbfilter_iso2022_jp_ms.h mbfilter_jis.c mbfilter_jis.h

2007-01-29 Thread Rui Hirokawa

hirokawaMon Jan 29 22:53:47 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/filters   mbfilter_iso2022_jp_ms.c 
mbfilter_iso2022_jp_ms.h 

  Modified files:  
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/libmbfl/filters   Makefile.am 
mbfilter_euc_jp_win.c 
mbfilter_jis.c mbfilter_jis.h 
unicode_table_jis.h 
/php-src/ext/mbstring/libmbfl/mbfl  mbfl_convert.c mbfl_encoding.c 
mbfl_ident.c 
  Log:
  fixed incompatibility with PHP 5.2.0 for encoding conversion between 
ShiftJIS(CP932), eucJP, ISO-2022-JP.
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.7r2=1.58.2.4.2.8diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.7 
php-src/ext/mbstring/config.m4:1.58.2.4.2.8
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.7 Fri Nov  3 01:11:35 2006
+++ php-src/ext/mbstring/config.m4  Mon Jan 29 22:53:47 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.7 2006/11/03 01:11:35 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.8 2007/01/29 22:53:47 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -210,6 +210,7 @@
  libmbfl/filters/mbfilter_iso8859_8.c
  libmbfl/filters/mbfilter_iso8859_9.c
  libmbfl/filters/mbfilter_jis.c
+ libmbfl/filters/mbfilter_iso2022_jp_ms.c
  libmbfl/filters/mbfilter_koi8r.c
  libmbfl/filters/mbfilter_armscii8.c
  libmbfl/filters/mbfilter_qprint.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.am?r1=1.4.4.1r2=1.4.4.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.am
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1 
php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.2
--- php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1Fri Nov  3 
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.amMon Jan 29 22:53:47 2007
@@ -2,7 +2,7 @@
 noinst_LTLIBRARIES=libmbfl_filters.la
 INCLUDES=-I../mbfl
 libmbfl_filters_la_LDFLAGS=-version-info $(SHLIB_VERSION)
-libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c 
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c 
mbfilter_iso8859_3.c mbfilter_iso8859_4.c mbfilter_iso8859_5.c 
mbfilter_iso8859_6.c mbfilter_iso8859_7.c mbfilter_iso8859_8.c 
mbfilter_iso8859_9.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c 
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c 
mbfilter_htmlent.c mbfilter_byte2.c mbfilter_byte4.c mbfilter_uuencode.c 
mbfilter_base64.c mbfilter_sjis.c mbfilter_7bit.c mbfilter_qprint.c 
mbfilter_ucs4.c mbfilter_ucs2.c mbfilter_utf32.c mbfilter_utf16.c 
mbfilter_utf8.c mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_euc_jp_win.c 
mbfilter_cp932.c mbfilter_cp51932.c mbfilter_euc_cn.c mbfilter_euc_kr.c 
mbfilter_uhc.c mbfilter_iso2022_kr.c mbfilter_cp866.c mbfilter_koi8r.c 
mbfilter_armscii8.c html_entities.c cp932_table.h html_entities.h 
mbfilter_7bit.h mbfil!
 ter_ascii.h mbfilter_base64.h mbfilter_big5.h mbfilter_byte2.h 
mbfilter_byte4.h mbfilter_cp1251.h mbfilter_cp1252.h mbfilter_cp866.h 
mbfilter_cp932.h mbfilter_cp51932.h mbfilter_cp936.h mbfilter_euc_cn.h 
mbfilter_euc_jp.h mbfilter_euc_jp_win.h mbfilter_euc_kr.h mbfilter_euc_tw.h 
mbfilter_htmlent.h mbfilter_hz.h mbfilter_iso2022_kr.h mbfilter_iso8859_1.h 
mbfilter_iso8859_10.h mbfilter_iso8859_13.h mbfilter_iso8859_14.h 
mbfilter_iso8859_15.h mbfilter_iso8859_16.h mbfilter_iso8859_2.h 
mbfilter_iso8859_3.h mbfilter_iso8859_4.h mbfilter_iso8859_5.h 
mbfilter_iso8859_6.h mbfilter_iso8859_7.h mbfilter_iso8859_8.h 
mbfilter_iso8859_9.h mbfilter_jis.h mbfilter_koi8r.h mbfilter_armscii8.h 
mbfilter_qprint.h mbfilter_sjis.h mbfilter_ucs2.h mbfilter_ucs4.h 
mbfilter_uhc.h mbfilter_utf16.h mbfilter_utf32.h mbfilter_utf7.h 
mbfilter_utf7imap.h mbfilter_utf8.h mbfilter_uuencode.h unicode_prop.h 
unicode_table_big5.h unicode_table_cns11643.h unicode_table_cp1251.h 
unicode_table_cp1252.h unicode_!
 table_cp866.h unicode_table_cp932_ext.h unicode_table_cp936.h unicode_
table_iso8859_10.h unicode_table_iso8859_13.h unicode_table_iso8859_14.h 
unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h 
unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h 
unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h 
unicode_table_iso8859_9.h unicode_table_jis.h unicode_table_koi8r.h 
unicode_table_armscii8.h unicode_table_uhc.h
+libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/libmbfl/filters Makefile.am mbfilter_cp51932.c mbfilter_cp51932.h mbfilter_euc_jp_win.c mbfilter_jis.c mbfilter_jis.h unicode_tab

2006-11-02 Thread Rui Hirokawa

hirokawaFri Nov  3 01:11:35 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/filters   mbfilter_cp51932.c 
mbfilter_cp51932.h 

  Modified files:  
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/libmbfl/filters   Makefile.am 
mbfilter_euc_jp_win.c 
mbfilter_jis.c mbfilter_jis.h 
unicode_table_jis.h 
/php-src/ext/mbstring/libmbfl/mbfl  mbfl_convert.c mbfl_encoding.c 
mbfl_encoding.h mbfl_ident.c 
  Log:
  added japanese legacy encoding support (made by [EMAIL PROTECTED])
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.6r2=1.58.2.4.2.7diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.6 
php-src/ext/mbstring/config.m4:1.58.2.4.2.7
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.6 Sun Oct  1 08:34:39 2006
+++ php-src/ext/mbstring/config.m4  Fri Nov  3 01:11:35 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.6 2006/10/01 08:34:39 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.7 2006/11/03 01:11:35 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -189,6 +189,7 @@
  libmbfl/filters/mbfilter_euc_cn.c
  libmbfl/filters/mbfilter_euc_jp.c
  libmbfl/filters/mbfilter_euc_jp_win.c
+ libmbfl/filters/mbfilter_cp51932.c
  libmbfl/filters/mbfilter_euc_kr.c
  libmbfl/filters/mbfilter_euc_tw.c
  libmbfl/filters/mbfilter_htmlent.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.am?r1=1.4r2=1.4.4.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.am
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4 
php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1
--- php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4Tue Mar 22 
22:22:10 2005
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.amFri Nov  3 01:11:35 2006
@@ -2,7 +2,7 @@
 noinst_LTLIBRARIES=libmbfl_filters.la
 INCLUDES=-I../mbfl
 libmbfl_filters_la_LDFLAGS=-version-info $(SHLIB_VERSION)
-libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c 
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c 
mbfilter_iso8859_3.c mbfilter_iso8859_4.c mbfilter_iso8859_5.c 
mbfilter_iso8859_6.c mbfilter_iso8859_7.c mbfilter_iso8859_8.c 
mbfilter_iso8859_9.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c 
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c 
mbfilter_htmlent.c mbfilter_byte2.c mbfilter_byte4.c mbfilter_uuencode.c 
mbfilter_base64.c mbfilter_sjis.c mbfilter_7bit.c mbfilter_qprint.c 
mbfilter_ucs4.c mbfilter_ucs2.c mbfilter_utf32.c mbfilter_utf16.c 
mbfilter_utf8.c mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_euc_jp_win.c 
mbfilter_cp932.c mbfilter_euc_cn.c mbfilter_euc_kr.c mbfilter_uhc.c 
mbfilter_iso2022_kr.c mbfilter_cp866.c mbfilter_koi8r.c mbfilter_armscii8.c 
html_entities.c cp932_table.h html_entities.h mbfilter_7bit.h mbfilter_ascii.h 
mbfilte!
 r_base64.h mbfilter_big5.h mbfilter_byte2.h mbfilter_byte4.h mbfilter_cp1251.h 
mbfilter_cp1252.h mbfilter_cp866.h mbfilter_cp932.h mbfilter_cp936.h 
mbfilter_euc_cn.h mbfilter_euc_jp.h mbfilter_euc_jp_win.h mbfilter_euc_kr.h 
mbfilter_euc_tw.h mbfilter_htmlent.h mbfilter_hz.h mbfilter_iso2022_kr.h 
mbfilter_iso8859_1.h mbfilter_iso8859_10.h mbfilter_iso8859_13.h 
mbfilter_iso8859_14.h mbfilter_iso8859_15.h mbfilter_iso8859_16.h 
mbfilter_iso8859_2.h mbfilter_iso8859_3.h mbfilter_iso8859_4.h 
mbfilter_iso8859_5.h mbfilter_iso8859_6.h mbfilter_iso8859_7.h 
mbfilter_iso8859_8.h mbfilter_iso8859_9.h mbfilter_jis.h mbfilter_koi8r.h 
mbfilter_armscii8.h mbfilter_qprint.h mbfilter_sjis.h mbfilter_ucs2.h 
mbfilter_ucs4.h mbfilter_uhc.h mbfilter_utf16.h mbfilter_utf32.h 
mbfilter_utf7.h mbfilter_utf7imap.h mbfilter_utf8.h mbfilter_uuencode.h 
unicode_prop.h unicode_table_big5.h unicode_table_cns11643.h 
unicode_table_cp1251.h unicode_table_cp1252.h unicode_table_cp866.h 
unicode_table_cp932_ext.!
 h unicode_table_cp936.h unicode_table_iso8859_10.h unicode_table_iso88
59_13.h unicode_table_iso8859_14.h unicode_table_iso8859_15.h 
unicode_table_iso8859_16.h unicode_table_iso8859_2.h unicode_table_iso8859_3.h 
unicode_table_iso8859_4.h unicode_table_iso8859_5.h unicode_table_iso8859_6.h 
unicode_table_iso8859_7.h unicode_table_iso8859_8.h unicode_table_iso8859_9.h 
unicode_table_jis.h unicode_table_koi8r.h unicode_table_armscii8.h 
unicode_table_uhc.h
+libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c 
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

2006-10-02 Thread Antony Dovgal


On 01.10.2006 12:34, Rui Hirokawa wrote:

hirokawaSun Oct  1 08:34:39 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring	config.m4 
  Log:

  fixed bug #37103: libmbfl headers was not installed correctly.


Please don't forget to merge this patch into HEAD.
Thanks.

--
Wbr, 
Antony Dovgal


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

2006-10-01 Thread Rui Hirokawa

hirokawaSun Oct  1 08:34:39 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
  Log:
  fixed bug #37103: libmbfl headers was not installed correctly.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.5r2=1.58.2.4.2.6diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.5 
php-src/ext/mbstring/config.m4:1.58.2.4.2.6
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.5 Sat Sep 23 10:55:58 2006
+++ php-src/ext/mbstring/config.m4  Sun Oct  1 08:34:39 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.5 2006/09/23 10:55:58 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.6 2006/10/01 08:34:39 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -302,7 +302,7 @@
   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])
+  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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

2006-09-23 Thread Rui Hirokawa

hirokawaSat Sep 23 10:55:59 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
  Log:
  fixed build problem of some extensions which depend on ext/mbstring.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.4r2=1.58.2.4.2.5diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.4 
php-src/ext/mbstring/config.m4:1.58.2.4.2.5
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.4 Thu Sep 21 16:37:20 2006
+++ php-src/ext/mbstring/config.m4  Sat Sep 23 10:55:58 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.4 2006/09/21 16:37:20 masugata Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.5 2006/09/23 10:55:58 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -302,7 +302,7 @@
   dnl libmbfl is required
   PHP_MBSTRING_SETUP_LIBMBFL
   PHP_MBSTRING_EXTENSION
-  PHP_INSTALL_HEADERS([ext/mbstring], [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 ])
+  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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 mbstring.c /ext/mbstring/oniguruma HISTORY config.h.in index.html oniguruma.h regcomp.c regexec.c regint.h

2006-09-21 Thread Seiji Masugata

masugataThu Sep 21 16:37:20 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 config.w32 mbstring.c 
/php-src/ext/mbstring/oniguruma HISTORY config.h.in index.html 
oniguruma.h regcomp.c regexec.c 
regint.h 
  Log:
  Updated bundled oniguruma library (used for multibyte regular expression) to 
4.4.4. fixed some Segmentation Fault, and build fails in OSX(Xcode 2.4/gcc 
4.0.1 problem). See #38452.
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.3r2=1.58.2.4.2.4diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.3 
php-src/ext/mbstring/config.m4:1.58.2.4.2.4
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.3 Fri Aug 25 16:26:50 2006
+++ php-src/ext/mbstring/config.m4  Thu Sep 21 16:37:20 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.3 2006/08/25 16:26:50 masugata Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.4 2006/09/21 16:37:20 masugata Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -103,7 +103,7 @@
 
 
 if test $PHP_MBREGEX_BACKTRACK != no; then
-  AC_DEFINE([HAVE_MBREGEX_BACKTRACK],1,[whether to check multibyte regex 
backtrack])
+  AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check 
multibyte regex backtrack])
 fi
 
 PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.1r2=1.10.2.1.2.2diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.1 
php-src/ext/mbstring/config.w32:1.10.2.1.2.2
--- php-src/ext/mbstring/config.w32:1.10.2.1.2.1Thu Jul 20 15:45:06 2006
+++ php-src/ext/mbstring/config.w32 Thu Sep 21 16:37:20 2006
@@ -1,8 +1,9 @@
-// $Id: config.w32,v 1.10.2.1.2.1 2006/07/20 15:45:06 masugata Exp $
+// $Id: config.w32,v 1.10.2.1.2.2 2006/09/21 16:37:20 masugata Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(mbstring, multibyte string functions, no);
 ARG_ENABLE(mbregex, multibyte regex support, no);
+ARG_ENABLE(mbregex-backtrack, check multibyte regex backtrack, yes);
 
 if (PHP_MBSTRING == yes) {
 
@@ -52,6 +53,9 @@
if (PHP_MBREGEX != no) {
AC_DEFINE('HAVE_STDARG_PROTOTYPES', 1, 'have stdarg.h');
AC_DEFINE('HAVE_MBREGEX', 1);
+   if (PHP_MBREGEX_BACKTRACK != no) {
+   AC_DEFINE('USE_COMBINATION_EXPLOSION_CHECK', 1);
+   }
ADD_SOURCES(ext/mbstring/oniguruma, regcomp.c regerror.c \
regenc.c regexec.c reggnu.c regparse.c regposerr.c \
regext.c regsyntax.c regtrav.c regversion.c st.c, 
mbstring);
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.13r2=1.224.2.22.2.14diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.13 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.14
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.13 Tue Sep  5 12:30:35 2006
+++ php-src/ext/mbstring/mbstring.c Thu Sep 21 16:37:20 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.13 2006/09/05 12:30:35 nlopess Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.14 2006/09/21 16:37:20 masugata Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -1050,11 +1050,11 @@
sprintf(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 HAVE_MBREGEX_BACKTRACK
+#ifdef USE_COMBINATION_EXPLOSION_CHECK
php_info_print_table_row(2, Multibyte regex (oniguruma) 
backtrack check, On);
-#else  /* HAVE_MBREGEX_BACKTRACK */
+#else  /* USE_COMBINATION_EXPLOSION_CHECK */
php_info_print_table_row(2, Multibyte regex (oniguruma) 
backtrack check, Off);
-#endif /* HAVE_MBREGEX_BACKTRACK */
+#endif /* USE_COMBINATION_EXPLOSION_CHECK */
}
 #endif
php_info_print_table_end();
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/HISTORY?r1=1.5.4.2r2=1.5.4.3diff_format=u
Index: php-src/ext/mbstring/oniguruma/HISTORY
diff -u php-src/ext/mbstring/oniguruma/HISTORY:1.5.4.2 
php-src/ext/mbstring/oniguruma/HISTORY:1.5.4.3
--- php-src/ext/mbstring/oniguruma/HISTORY:1.5.4.2  Thu Aug 24 17:03:47 2006
+++ php-src/ext/mbstring/oniguruma/HISTORY  Thu Sep 21 16:37:20 2006
@@ -1,5 +1,46 @@
 History
 
+2006/09/19: Version 4.4.4
+
+2006/09/19: [test] success in ruby 1.9.0 (2006-08-22) [i686-linux].
+2006/09/19: [impl] (thanks KOYAMA Tetsuji)
+   HAVE_STDARG_PROTOTYPES was not defined in Mac OS X
+   by Xcode 2.4(gcc 4.0.1) problem. [php-dev 1312] etc...
+
+2006/09/15: Version 4.4.3
+
+2006/09/15: [test]

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 mbstring.c /ext/mbstring/oniguruma regcomp.c regint.h

2006-08-25 Thread Seiji Masugata

masugataFri Aug 25 16:26:50 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 mbstring.c 
/php-src/ext/mbstring/oniguruma regcomp.c regint.h 
  Log:
  added configure option --disable-mbregex-backtrack.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.2r2=1.58.2.4.2.3diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.2 
php-src/ext/mbstring/config.m4:1.58.2.4.2.3
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.2 Thu Jul 20 15:45:06 2006
+++ php-src/ext/mbstring/config.m4  Fri Aug 25 16:26:50 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.2 2006/07/20 15:45:06 masugata Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.3 2006/08/25 16:26:50 masugata Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -101,6 +101,11 @@
 fi
 AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])
 
+
+if test $PHP_MBREGEX_BACKTRACK != no; then
+  AC_DEFINE([HAVE_MBREGEX_BACKTRACK],1,[whether to check multibyte regex 
backtrack])
+fi
+
 PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
 PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
 PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
@@ -278,6 +283,9 @@
 PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support],
 [  --disable-mbregex MBSTRING: Disable multibyte regex support], yes, 
no)
 
+PHP_ARG_ENABLE([mbregex_backtrack], [whether to check multibyte regex 
backtrack],
+[  --disable-mbregex-backtrack MBSTRING: Disable multibyte regex 
backtrack check], yes, no)
+
 PHP_ARG_WITH(libmbfl, [for external libmbfl],
 [  --with-libmbfl[=DIR]  MBSTRING: Use external libmbfl. DIR is the 
libmbfl install prefix.
 If DIR is not set, the bundled libmbfl will be 
used], no, no)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.10r2=1.224.2.22.2.11diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.10 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.11
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.10 Thu Aug 24 16:52:36 2006
+++ php-src/ext/mbstring/mbstring.c Fri Aug 25 16:26:50 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.10 2006/08/24 16:52:36 masugata Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.11 2006/08/25 16:26:50 masugata Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -1050,6 +1050,11 @@
sprintf(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 HAVE_MBREGEX_BACKTRACK
+   php_info_print_table_row(2, Multibyte regex (oniguruma) 
backtrack check, On);
+#else  /* HAVE_MBREGEX_BACKTRACK */
+   php_info_print_table_row(2, Multibyte regex (oniguruma) 
backtrack check, Off);
+#endif /* HAVE_MBREGEX_BACKTRACK */
}
 #endif
php_info_print_table_end();
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regcomp.c?r1=1.5.4.2r2=1.5.4.3diff_format=u
Index: php-src/ext/mbstring/oniguruma/regcomp.c
diff -u php-src/ext/mbstring/oniguruma/regcomp.c:1.5.4.2 
php-src/ext/mbstring/oniguruma/regcomp.c:1.5.4.3
--- php-src/ext/mbstring/oniguruma/regcomp.c:1.5.4.2Thu Aug 24 17:03:47 2006
+++ php-src/ext/mbstring/oniguruma/regcomp.cFri Aug 25 16:26:50 2006
@@ -186,6 +186,8 @@
   return 0;
 }
 
+#ifdef USE_COMBINATION_EXPLOSION_CHECK
+
 static int
 add_state_check_num(regex_t* reg, int num)
 {
@@ -194,6 +196,7 @@
   BBUF_ADD(reg, n, SIZE_STATE_CHECK_NUM);
   return 0;
 }
+#endif /* USE_COMBINATION_EXPLOSION_CHECK */
 
 static int
 add_rel_addr(regex_t* reg, int addr)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regint.h?r1=1.5.4.2r2=1.5.4.3diff_format=u
Index: php-src/ext/mbstring/oniguruma/regint.h
diff -u php-src/ext/mbstring/oniguruma/regint.h:1.5.4.2 
php-src/ext/mbstring/oniguruma/regint.h:1.5.4.3
--- php-src/ext/mbstring/oniguruma/regint.h:1.5.4.2 Thu Aug 24 17:03:47 2006
+++ php-src/ext/mbstring/oniguruma/regint.h Fri Aug 25 16:26:50 2006
@@ -59,7 +59,9 @@
 /* #define USE_UNICODE_FULL_RANGE_CTYPE */ /* -- move to regenc.h */
 #define USE_NAMED_GROUP
 #define USE_SUBEXP_CALL
+#ifdef HAVE_MBREGEX_BACKTRACK
 #define USE_COMBINATION_EXPLOSION_CHECK /* (X*)* */
+#endif /* HAVE_MBREGEX_BACKTRACK */
 #define USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK /* /(?:()|())*\2/ */
 #define USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE /* /\n$/ =~ \n */
 #define USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c re

2006-07-27 Thread Antony Dovgal


On 20.07.2006 18:45, Seiji Masugata wrote:

masugataThu Jul 20 15:45:08 2006 UTC
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regerror.c?r1=1.3r2=1.3.4.1diff_format=u
Index: php-src/ext/mbstring/oniguruma/regerror.c
diff -u php-src/ext/mbstring/oniguruma/regerror.c:1.3 
php-src/ext/mbstring/oniguruma/regerror.c:1.3.4.1
--- php-src/ext/mbstring/oniguruma/regerror.c:1.3   Sun Feb 20 22:18:08 2005
+++ php-src/ext/mbstring/oniguruma/regerror.c   Thu Jul 20 15:45:07 2006

skipped

@@ -256,36 +258,36 @@
 
 void

 #ifdef HAVE_STDARG_PROTOTYPES
-onig_snprintf_with_pattern(char buf[], int bufsize, OnigEncoding enc,
-   char* pat, char* pat_end, char *fmt, ...)
+onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
+   UChar* pat, UChar* pat_end, const UChar *fmt, ...)
 #else
 onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
-char buf[];
+UChar buf[];
 int bufsize;
 OnigEncoding enc;
-char* pat;
-char* pat_end;
-const char *fmt;
+UChar* pat;
+UChar* pat_end;
+const UChar *fmt;
 va_dcl
 #endif
 {
   int n, need, len;
   UChar *p, *s, *bp;
-  char bs[6];
+  UChar bs[6];
   va_list args;
 
-  va_init_list(args, fmt);

-  n = vsnprintf(buf, bufsize, fmt, args);
+  va_init_list(args, (const char* )fmt);

   ^
This code doesn't compile with Intel Compiler anymore (but works fine with GCC).
Changing it to va_init_list(args, fmt) makes both ICC and GCC happy.
I've fixed it in CVS, please make sure this change doesn't affect the 
functionality of the code.

--
Wbr, 
Antony Dovgal


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c reg

2006-07-27 Thread Seiji Masugata

Hi, Antony. 

 This code doesn't compile with Intel Compiler anymore (but works fine with 
 GCC).
 Changing it to va_init_list(args, fmt) makes both ICC and GCC happy.

Oh... very sorry.
It contacts the author as corrected.

 I've fixed it in CVS, please make sure this change doesn't affect the 
 functionality of the code.

Ok, confirms it. :)
Thank you.

--
Seiji Masugata

On Thu, 27 Jul 2006 10:40:25 +0300
Antony Dovgal wrote:

 On 20.07.2006 18:45, Seiji Masugata wrote:
  masugataThu Jul 20 15:45:08 2006 UTC
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regerror.c?r1=1.3r2=1.3.4.1diff_format=u
  Index: php-src/ext/mbstring/oniguruma/regerror.c
  diff -u php-src/ext/mbstring/oniguruma/regerror.c:1.3 
  php-src/ext/mbstring/oniguruma/regerror.c:1.3.4.1
  --- php-src/ext/mbstring/oniguruma/regerror.c:1.3   Sun Feb 20 22:18:08 2005
  +++ php-src/ext/mbstring/oniguruma/regerror.c   Thu Jul 20 15:45:07 2006
 skipped
  @@ -256,36 +258,36 @@
   
   void
   #ifdef HAVE_STDARG_PROTOTYPES
  -onig_snprintf_with_pattern(char buf[], int bufsize, OnigEncoding enc,
  -   char* pat, char* pat_end, char *fmt, ...)
  +onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
  +   UChar* pat, UChar* pat_end, const UChar *fmt, 
  ...)
   #else
   onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
  -char buf[];
  +UChar buf[];
   int bufsize;
   OnigEncoding enc;
  -char* pat;
  -char* pat_end;
  -const char *fmt;
  +UChar* pat;
  +UChar* pat_end;
  +const UChar *fmt;
   va_dcl
   #endif
   {
 int n, need, len;
 UChar *p, *s, *bp;
  -  char bs[6];
  +  UChar bs[6];
 va_list args;
   
  -  va_init_list(args, fmt);
  -  n = vsnprintf(buf, bufsize, fmt, args);
  +  va_init_list(args, (const char* )fmt);
 ^
 This code doesn't compile with Intel Compiler anymore (but works fine with 
 GCC).
 Changing it to va_init_list(args, fmt) makes both ICC and GCC happy.
 I've fixed it in CVS, please make sure this change doesn't affect the 
 functionality of the code.
 
 -- 
 Wbr, 
 Antony Dovgal
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c reg

2006-07-27 Thread Antony Dovgal


On 27.07.2006 11:31, Seiji Masugata wrote:
Hi, Antony. 


This code doesn't compile with Intel Compiler anymore (but works fine with GCC).
Changing it to va_init_list(args, fmt) makes both ICC and GCC happy.


Oh... very sorry.
It contacts the author as corrected.


No problem. Thanks a lot.


I've fixed it in CVS, please make sure this change doesn't affect the 
functionality of the code.


Ok, confirms it. :)
Thank you.



--
Wbr, 
Antony Dovgal


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

2006-05-07 Thread Rasmus Lerdorf

rasmus  Sun May  7 16:56:07 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
  Log:
  INSTALL_HEADERS takes absolute filenames there in the second arg.
  This makes pecl/mailparse build again
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4r2=1.58.2.4.2.1diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4 
php-src/ext/mbstring/config.m4:1.58.2.4.2.1
--- php-src/ext/mbstring/config.m4:1.58.2.4 Mon Apr 17 22:13:56 2006
+++ php-src/ext/mbstring/config.m4  Sun May  7 16:56:07 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4 2006/04/17 22:13:56 sniper Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.1 2006/05/07 16:56:07 rasmus Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -293,7 +293,7 @@
   dnl libmbfl is required
   PHP_MBSTRING_SETUP_LIBMBFL
   PHP_MBSTRING_EXTENSION
-  PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/ libmbfl/mbfl])
+  PHP_INSTALL_HEADERS([ext/mbstring], [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 ])
 fi
 
 # vim600: sts=2 sw=2 et

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/oniguruma php_onig_compat.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/libmbfl/filters Makefile.am mbfilter_euc_jp_win.c mbfilter_iso2022_jp_ms.c mbfilter_iso2022_jp_ms.h mbfilter_jis.c mbfilter_jis.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/libmbfl/filters Makefile.am mbfilter_cp51932.c mbfilter_cp51932.h mbfilter_euc_jp_win.c mbfilter_jis.c mbfilter_jis.h unicode_tab

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 mbstring.c /ext/mbstring/oniguruma HISTORY config.h.in index.html oniguruma.h regcomp.c regexec.c regint.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 mbstring.c /ext/mbstring/oniguruma regcomp.c regint.h

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c re

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c reg

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 config.w32 /ext/mbstring/oniguruma COPYING HISTORY README README.ja config.h.in index.html onigcmpt200.h oniggnu.h oniguruma.h regcomp.c reg

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4

14 matches

Site Navigation

Mail list logo

Footer information