hirokawa Mon Sep 22 22:43:05 2003 EDT
Modified files:
/php-src/ext/mbstring config.m4 mbstring.c mbstring.dsp
php_mbregex.c
Log:
fixed win32-build and update e-mail address in mbstring.
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.37 php-src/ext/mbstring/config.m4:1.38
--- php-src/ext/mbstring/config.m4:1.37 Sat Aug 30 18:09:27 2003
+++ php-src/ext/mbstring/config.m4 Mon Sep 22 22:43:04 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37 2003/08/30 22:09:27 sniper Exp $
+dnl $Id: config.m4,v 1.38 2003/09/23 02:43:04 hirokawa Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -98,6 +98,7 @@
PHP_MBSTRING_ADD_INCLUDE([libmbfl])
PHP_MBSTRING_ADD_INCLUDE([libmbfl/mbfl])
PHP_MBSTRING_ADD_CONFIG_HEADER([libmbfl/config.h])
+ PHP_MBSTRING_ADD_CFLAG([-DHAVE_LIBMBFL_CONFIG_H=1])
PHP_MBSTRING_ADD_SOURCES([
libmbfl/filters/html_entities.c
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.195 php-src/ext/mbstring/mbstring.c:1.196
--- php-src/ext/mbstring/mbstring.c:1.195 Sun Aug 31 08:41:37 2003
+++ php-src/ext/mbstring/mbstring.c Mon Sep 22 22:43:04 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.195 2003/08/31 12:41:37 zeev Exp $ */
+/* $Id: mbstring.c,v 1.196 2003/09/23 02:43:04 hirokawa Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -95,7 +95,7 @@
};
#endif
-#if defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
+#if defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
@@ -104,7 +104,7 @@
};
#endif
-#if defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
+#if defined(HAVE_MBSTR_TW) && !defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
@@ -113,7 +113,7 @@
};
#endif
-#if defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_CN) &
!defined(HAVE_MBSTR_JA)
+#if defined(HAVE_MBSTR_KR) && !defined(HAVE_MBSTR_TW) && !defined(HAVE_MBSTR_CN) &&
!defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
@@ -122,7 +122,7 @@
};
#endif
-#if defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) &
!defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
+#if defined(HAVE_MBSTR_RU) && !defined(HAVE_MBSTR_KR) && !defined(HAVE_MBSTR_TW) &&
!defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8,
@@ -132,7 +132,7 @@
};
#endif
-#if !defined(HAVE_MBSTR_RU) & !defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_TW) &
!defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA)
+#if !defined(HAVE_MBSTR_RU) && !defined(HAVE_MBSTR_KR) && !defined(HAVE_MBSTR_TW) &&
!defined(HAVE_MBSTR_CN) && !defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8
Index: php-src/ext/mbstring/mbstring.dsp
diff -u php-src/ext/mbstring/mbstring.dsp:1.17 php-src/ext/mbstring/mbstring.dsp:1.18
--- php-src/ext/mbstring/mbstring.dsp:1.17 Sun Aug 31 12:08:46 2003
+++ php-src/ext/mbstring/mbstring.dsp Mon Sep 22 22:43:04 2003
@@ -124,6 +124,10 @@
# End Source File
# Begin Source File
+SOURCE=.\php_mbregex.c
+# End Source File
+# Begin Source File
+
SOURCE=.\php_unicode.c
!IF "$(CFG)" == "mbstring - Win32 Release_TS MBSTRING"
@@ -173,6 +177,10 @@
# End Source File
# Begin Source File
+SOURCE=.\php_mbregex.h
+# End Source File
+# Begin Source File
+
SOURCE=.\php_unicode.h
!IF "$(CFG)" == "mbstring - Win32 Release_TS MBSTRING"
@@ -478,7 +486,32 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\libmbfl\config.h
+SOURCE=.\libmbfl\config.h.vc6
+
+!IF "$(CFG)" == "mbstring - Win32 Release_TS MBSTRING"
+
+# Begin Custom Build
+InputDir=.\libmbfl
+InputPath=.\libmbfl\config.h.vc6
+
+"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy $(InputDir)\config.h.vc6 "$(InputDir)\config.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mbstring - Win32 Debug_TS MBSTRING"
+
+# Begin Custom Build
+InputDir=.\libmbfl
+InputPath=.\libmbfl\config.h.vc6
+
+"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy $(InputDir)\config.h.vc6 "$(InputDir)\config.h"
+
+# End Custom Build
+
+!ENDIF
+
# End Source File
# Begin Source File
@@ -847,6 +880,91 @@
# Begin Source File
SOURCE=.\libmbfl\filters\unicode_table_uhc.h
+# End Source File
+# End Group
+# End Group
+# Begin Group "oniguruma"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files No. 2"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\oniguruma\regcomp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\regerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\regexec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\reggnu.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\regparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\regposerr.c
+# End Source File
+# End Group
+# Begin Group "Header Files No. 2"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\oniguruma\win32\config.h
+
+!IF "$(CFG)" == "mbstring - Win32 Release_TS MBSTRING"
+
+# Begin Custom Build
+InputDir=.\oniguruma\win32
+InputPath=.\oniguruma\win32\config.h
+
+"$(InputDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy $(InputDir)\config.h "$(InputDir)\..\config.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mbstring - Win32 Debug_TS MBSTRING"
+
+# Begin Custom Build
+InputDir=.\oniguruma\win32
+InputPath=.\oniguruma\win32\config.h
+
+"$(InputDir)\..\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy $(InputDir)\config.h "$(InputDir)\..\config.h"
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\onigposix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\oniguruma.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\php_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\regint.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\oniguruma\regparse.h
# End Source File
# End Group
# End Group
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.41 php-src/ext/mbstring/php_mbregex.c:1.42
--- php-src/ext/mbstring/php_mbregex.c:1.41 Sat Aug 23 02:18:34 2003
+++ php-src/ext/mbstring/php_mbregex.c Mon Sep 22 22:43:04 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.41 2003/08/23 06:18:34 hirokawa Exp $ */
+/* $Id: php_mbregex.c,v 1.42 2003/09/23 02:43:04 hirokawa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -653,7 +653,8 @@
}
} else { /* nomatch */
/* stick that last bit of string on our output */
- smart_str_appendl(&out_buf, pos, (size_t)((UChar *)(string +
string_len) - pos));
+ if ((UChar *)(string + string_len) > pos)
+ smart_str_appendl(&out_buf, pos, (size_t)((UChar
*)(string + string_len) - pos));
}
php_mb_regex_region_free(regs, 0);
}
@@ -1124,3 +1125,11 @@
#endif /* HAVE_MBREGEX */
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: fdm=marker
+ * vim: noet sw=4 ts=4
+ */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
