moriyoshi Mon, 15 Mar 2010 14:19:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=296242
Log: - Fix win32 build. (notified by Rob. Thanks) Changed paths: U php/php-src/branches/PHP_5_2/ext/mbstring/config.w32 D php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.vc6 A php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.w32 A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.w32 U php/php-src/trunk/ext/mbstring/config.w32 A php/php-src/trunk/ext/mbstring/libmbfl/config.h.w32 Modified: php/php-src/branches/PHP_5_2/ext/mbstring/config.w32 =================================================================== --- php/php-src/branches/PHP_5_2/ext/mbstring/config.w32 2010-03-15 13:56:12 UTC (rev 296241) +++ php/php-src/branches/PHP_5_2/ext/mbstring/config.w32 2010-03-15 14:19:51 UTC (rev 296242) @@ -7,7 +7,7 @@ if (PHP_MBSTRING == "yes") { - FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.vc6", + FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32", "ext\\mbstring\\libmbfl\\config.h", true); FSO.CopyFile("ext\\mbstring\\oniguruma\\win32\\config.h", "ext\\mbstring\\oniguruma\\config.h", true); Deleted: php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.vc6 =================================================================== --- php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.vc6 2010-03-15 13:56:12 UTC (rev 296241) +++ php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.vc6 2010-03-15 14:19:51 UTC (rev 296242) @@ -1,12 +0,0 @@ -#define HAVE_STDIO_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STDDEF_H 1 -#define HAVE_ASSERT_H 1 -#define HAVE_MEMORY_H 1 -/* #undef HAVE_STRINGS_H */ -#define HAVE_STRING_H 1 -/* #undef HAVE_STRCASECMP */ -#define HAVE_STRICMP 1 -#define HAVE_WIN32_NATIVE_THREAD 1 -#define USE_WIN32_NATIVE_THREAD 1 -#define ENABLE_THREADS 1 Added: php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.w32 =================================================================== --- php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.w32 (rev 0) +++ php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/config.h.w32 2010-03-15 14:19:51 UTC (rev 296242) @@ -0,0 +1,12 @@ +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDDEF_H 1 +#define HAVE_ASSERT_H 1 +#define HAVE_MEMORY_H 1 +/* #undef HAVE_STRINGS_H */ +#define HAVE_STRING_H 1 +/* #undef HAVE_STRCASECMP */ +#define HAVE_STRICMP 1 +#define HAVE_WIN32_NATIVE_THREAD 1 +#define USE_WIN32_NATIVE_THREAD 1 +#define ENABLE_THREADS 1 Added: php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.w32 =================================================================== --- php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.w32 (rev 0) +++ php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.w32 2010-03-15 14:19:51 UTC (rev 296242) @@ -0,0 +1,12 @@ +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDDEF_H 1 +#define HAVE_ASSERT_H 1 +#define HAVE_MEMORY_H 1 +/* #undef HAVE_STRINGS_H */ +#define HAVE_STRING_H 1 +/* #undef HAVE_STRCASECMP */ +#define HAVE_STRICMP 1 +#define HAVE_WIN32_NATIVE_THREAD 1 +#define USE_WIN32_NATIVE_THREAD 1 +#define ENABLE_THREADS 1 Modified: php/php-src/trunk/ext/mbstring/config.w32 =================================================================== --- php/php-src/trunk/ext/mbstring/config.w32 2010-03-15 13:56:12 UTC (rev 296241) +++ php/php-src/trunk/ext/mbstring/config.w32 2010-03-15 14:19:51 UTC (rev 296242) @@ -7,7 +7,7 @@ if (PHP_MBSTRING != "no") { - FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.vc6", + FSO.CopyFile("ext\\mbstring\\libmbfl\\config.h.w32", "ext\\mbstring\\libmbfl\\config.h", true); FSO.CopyFile("ext\\mbstring\\oniguruma\\win32\\config.h", "ext\\mbstring\\oniguruma\\config.h", true); Added: php/php-src/trunk/ext/mbstring/libmbfl/config.h.w32 =================================================================== --- php/php-src/trunk/ext/mbstring/libmbfl/config.h.w32 (rev 0) +++ php/php-src/trunk/ext/mbstring/libmbfl/config.h.w32 2010-03-15 14:19:51 UTC (rev 296242) @@ -0,0 +1,12 @@ +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDDEF_H 1 +#define HAVE_ASSERT_H 1 +#define HAVE_MEMORY_H 1 +/* #undef HAVE_STRINGS_H */ +#define HAVE_STRING_H 1 +/* #undef HAVE_STRCASECMP */ +#define HAVE_STRICMP 1 +#define HAVE_WIN32_NATIVE_THREAD 1 +#define USE_WIN32_NATIVE_THREAD 1 +#define ENABLE_THREADS 1
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php