Enable bundled build of ext/ctype and ext/mbstring on Win32.

diff --git a/main/config.w32.h b/main/config.w32.h
index a886b08ac08f9c1b7a79435f61ef886261fc341b..6dcef2c59e6140ccf0fc3d6414e7399b9c279332 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -33,9 +33,16 @@
 /* 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
 

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 042bf98b3497949669b4e97e7c1b6b6108395861..0205f5763a15bd0968a2cde8bf74d9be3594c131 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -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 @@ zend_module_entry *php_builtin_extensions[] = {
 #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

diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index b749ba25ac0558ec0313eef70b4ad8965da45676..7ad6711a6e27820e20c25cb2cf1cd659a52b85f0 100644 (file)
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -860,6 +860,30 @@ SOURCE=..\ext\pcre\pcrelib\pcre.h
 # PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\ctype\ctype.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbfilter.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbfilter_ja.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbregex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbstring.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\php_mbregex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\overload\overload.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 74f850d27005a5aa13a5f35a766c3cbd8240ef4c..3e05b522e272c0bd281f4508d79321a210977c80 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -450,6 +450,30 @@ SOURCE=..\regex\regfree.c
 # PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\ctype\ctype.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbfilter.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbfilter_ja.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbregex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\mbstring.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\mbstring\php_mbregex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\overload\overload.c\r
 # End Source File\r
 # Begin Source File\r