Re: cvs: php4 /ext/mbstring mbstring.dsp mbstring.h php_mbregex.c php_unicode.c php_unicode.h

What was going wrong with your build? And you don't have to have mbregex disabled here, It's made to be enabled by default with --enable-mbstring specified also. Please revert this. Moriyoshi "Frank M. Kromann" <frank@kromann.info> wrote: > fmk Mon Dec 2 13:19:18 2002 EDT > > Modified files: > /php4/ext/mbstring mbstring.dsp mbstring.h php_mbregex.c > php_unicode.c php_unicode.h > Log: > Fixing build on WIn32 > MBREGEX is disabled for now. 5 mbre_* functions are undefined on WIn32 > > > Index: php4/ext/mbstring/mbstring.dsp > diff -u php4/ext/mbstring/mbstring.dsp:1.14 php4/ext/mbstring/mbstring.dsp:1.15 > --- php4/ext/mbstring/mbstring.dsp:1.14 Sat Nov 23 17:59:24 2002 > +++ php4/ext/mbstring/mbstring.dsp Mon Dec 2 13:19:17 2002 > @@ -43,7 +43,7 @@ > # PROP Ignore_Export_Lib 0 > # PROP Target_Dir "" > # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D > "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MBSTRING_EXPORTS" /YX > /FD /c > -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I > "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "_MBCS" /D > "_USRDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D > "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D > MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D > HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /FR /YX /FD /c > +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I > "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "_MBCS" /D > "_USRDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D > "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D > MBSTRING_EXPORTS=1 /FR /YX /FD /c > # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD BASE RSC /l 0x407 /d "NDEBUG" > @@ -69,7 +69,7 @@ > # PROP Ignore_Export_Lib 0 > # PROP Target_Dir "" > # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D > "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MBSTRING_EXPORTS" /YX > /FD /GZ /c > -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I > "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "MBSTRING_EXPORTS" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" > /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 > /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D > HAVE_MBSTR_TW=1 /YX /FD /GZ /c > +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I > "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "MBSTRING_EXPORTS" /D > "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" > /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /YX /FD /GZ /c > # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 > # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 > # ADD BASE RSC /l 0x407 /d "_DEBUG" > Index: php4/ext/mbstring/mbstring.h > diff -u php4/ext/mbstring/mbstring.h:1.45 php4/ext/mbstring/mbstring.h:1.46 > --- php4/ext/mbstring/mbstring.h:1.45 Sat Nov 23 15:14:33 2002 > +++ php4/ext/mbstring/mbstring.h Mon Dec 2 13:19:17 2002 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: mbstring.h,v 1.45 2002/11/23 20:14:33 moriyoshi Exp $ */ > +/* $Id: mbstring.h,v 1.46 2002/12/02 18:19:17 fmk Exp $ */ > > /* > * PHP4 Multibyte String module "mbstring" (currently only for Japanese) > @@ -49,6 +49,20 @@ > #ifdef COMPILE_DL_MBSTRING > #undef HAVE_MBSTRING > #define HAVE_MBSTRING 1 > +#ifdef PHP_WIN32 > +# undef HAVE_MBREGEX > +# define HAVE_MBREGEX 0 > +# undef HAVE_MBSTR_CN > +# define HAVE_MBSTR_CN 1 > +# undef HAVE_MBSTR_JA > +# define HAVE_MBSTR_JA 1 > +# undef HAVE_MBSTR_KR > +# define HAVE_MBSTR_KR 1 > +# undef HAVE_MBSTR_RU > +# define HAVE_MBSTR_RU 1 > +# undef HAVE_MBSTR_TW > +# define HAVE_MBSTR_TW 1 > +#endif > #endif > > #ifdef PHP_WIN32 > Index: php4/ext/mbstring/php_mbregex.c > diff -u php4/ext/mbstring/php_mbregex.c:1.23 php4/ext/mbstring/php_mbregex.c:1.24 > --- php4/ext/mbstring/php_mbregex.c:1.23 Mon Nov 25 12:20:19 2002 > +++ php4/ext/mbstring/php_mbregex.c Mon Dec 2 13:19:17 2002 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_mbregex.c,v 1.23 2002/11/25 17:20:19 moriyoshi Exp $ */ > +/* $Id: php_mbregex.c,v 1.24 2002/12/02 18:19:17 fmk Exp $ */ > > > #ifdef HAVE_CONFIG_H > @@ -25,9 +25,9 @@ > > #include "php.h" > #include "php_ini.h" > -#include "php_mbregex.h" > -#include "mbregex.h" > #include "mbstring.h" > +#include "mbregex.h" > +#include "php_mbregex.h" > > #if HAVE_MBREGEX > > Index: php4/ext/mbstring/php_unicode.c > diff -u php4/ext/mbstring/php_unicode.c:1.5 php4/ext/mbstring/php_unicode.c:1.6 > --- php4/ext/mbstring/php_unicode.c:1.5 Wed Nov 13 18:11:14 2002 > +++ php4/ext/mbstring/php_unicode.c Mon Dec 2 13:19:17 2002 > @@ -36,6 +36,7 @@ > > #include "php.h" > #include "php_ini.h" > +#include "mbstring.h" > > #if HAVE_MBSTRING > > Index: php4/ext/mbstring/php_unicode.h > diff -u php4/ext/mbstring/php_unicode.h:1.2 php4/ext/mbstring/php_unicode.h:1.3 > --- php4/ext/mbstring/php_unicode.h:1.2 Wed Nov 13 18:11:14 2002 > +++ php4/ext/mbstring/php_unicode.h Mon Dec 2 13:19:17 2002 > @@ -103,7 +103,7 @@ > > MBSTRING_API int php_unicode_is_prop(unsigned long code, unsigned long mask1, > unsigned long mask2); > -MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t srclen, size_t > *retlen, > +MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t srclen, size_t > *ret_len, > char *src_encoding TSRMLS_DC); > > #define PHP_UNICODE_CASE_UPPER 0 > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php >