cvs: php4 /main config.w32.h internal_functions_win32.c /win32 php4dll.dsp php4dllts.dsp

sebastian Sun Apr 28 13:50:10 2002 EDT Modified files: /php4/main config.w32.h internal_functions_win32.c /php4/win32 php4dll.dsp php4dllts.dsp Log: Enable bundled build of ext/ctype and ext/mbstring on Win32. Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.57 php4/main/config.w32.h:1.58 --- php4/main/config.w32.h:1.57 Thu Apr 18 12:34:13 2002 +++ php4/main/config.w32.h Sun Apr 28 13:50:09 2002 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.57 2002/04/18 16:34:13 sebastian Exp $ + $Id: config.w32.h,v 1.58 2002/04/28 17:50:09 sebastian Exp $ */ /* Default PHP / PEAR directories */ @@ -33,8 +33,15 @@ /* Enable / Disable COM extension (default: enabled) */ #define HAVE_COM 1 +/* Enable / Disable CTYPE extension (default: enabled) */ +#define HAVE_CTYPE 1 + /* Enable / Disable FTP extension (default: enabled) */ #define HAVE_FTP 1 + +/* Enable / Disable MBSTRING extension (default: enabled) */ +#define HAVE_MBSTRING 1 +#define HAVE_MBREGEX 1 /* Enable / Disable MySQL extension (default: enabled) */ #define HAVE_MYSQL 1 Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.63 php4/main/internal_functions_win32.c:1.64 --- php4/main/internal_functions_win32.c:1.63 Thu Apr 18 13:56:53 2002 +++ php4/main/internal_functions_win32.c Sun Apr 28 13:50:09 2002 @@ -16,7 +16,7 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ - $Id: internal_functions_win32.c,v 1.63 2002/04/18 17:56:53 sebastian Exp $ + $Id: internal_functions_win32.c,v 1.64 2002/04/28 17:50:09 sebastian Exp $ */ /* {{{ includes @@ -30,9 +30,6 @@ #include <stdlib.h> #include <stdio.h> -#if WITH_BCMATH -#include "ext/bcmath/php_bcmath.h" -#endif #include "ext/standard/dl.h" #include "ext/standard/file.h" #include "ext/standard/fsock.h" @@ -48,9 +45,15 @@ #include "ext/standard/php_lcg.h" #include "ext/standard/php_array.h" #include "ext/standard/php_assert.h" +#if WITH_BCMATH +#include "ext/bcmath/php_bcmath.h" +#endif #if HAVE_CALENDAR #include "ext/calendar/php_calendar.h" #endif +#if HAVE_CTYPE +#include "ext/ctype/php_ctype.h" +#endif #if HAVE_COM #include "ext/com/php_COM.h" #endif @@ -76,7 +79,7 @@ #if HAVE_MYSQL #include "ext/mysql/php_mysql.h" #endif -#if defined(MBSTR_ENC_TRANS) +#if HAVE_MBSTRING #include "ext/mbstring/mbstring.h" #endif #if HAVE_OVERLOAD @@ -97,13 +100,16 @@ #if HAVE_CALENDAR ,phpext_calendar_ptr #endif +#if HAVE_CTYPE + ,phpext_ctype_ptr +#endif #if HAVE_COM ,phpext_com_ptr #endif #if HAVE_FTP ,phpext_ftp_ptr #endif -#if defined(MBSTR_ENC_TRANS) +#if HAVE_MBSTRING ,phpext_mbstring_ptr #endif #if HAVE_MYSQL Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.27 php4/win32/php4dll.dsp:1.28 --- php4/win32/php4dll.dsp:1.27 Wed Apr 17 00:44:02 2002 +++ php4/win32/php4dll.dsp Sun Apr 28 13:50:09 2002 @@ -860,6 +860,30 @@ # PROP Default_Filter ".c" # Begin Source File +SOURCE=..\ext\ctype\ctype.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbfilter.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbfilter_ja.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbregex.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbstring.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\php_mbregex.c +# End Source File +# Begin Source File + SOURCE=..\ext\overload\overload.c # End Source File # Begin Source File Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.62 php4/win32/php4dllts.dsp:1.63 --- php4/win32/php4dllts.dsp:1.62 Wed Apr 17 00:44:02 2002 +++ php4/win32/php4dllts.dsp Sun Apr 28 13:50:09 2002 @@ -450,6 +450,30 @@ # PROP Default_Filter ".c" # Begin Source File +SOURCE=..\ext\ctype\ctype.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbfilter.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbfilter_ja.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbregex.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\mbstring.c +# End Source File +# Begin Source File + +SOURCE=..\ext\mbstring\php_mbregex.c +# End Source File +# Begin Source File + SOURCE=..\ext\overload\overload.c # End Source File # Begin Source File