pajoye Wed, 03 Feb 2010 18:29:52 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294433
Log: - merge fix build for sha Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c U php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293974 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293558,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c 2010-02-03 18:17:32 UTC (rev 294432) +++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c 2010-02-03 18:29:52 UTC (rev 294433) @@ -2,10 +2,8 @@ Released into the Public Domain by Ulrich Drepper <drep...@redhat.com>. */ /* Windows VC++ port by Pierre Joye <pie...@php.net> */ -#ifndef PHP_WIN32 -# include "php.h" -# include "php_main.h" -#endif +#include "php.h" +#include "php_main.h" #include <errno.h> #include <limits.h> Modified: php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c 2010-02-03 18:17:32 UTC (rev 294432) +++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c 2010-02-03 18:29:52 UTC (rev 294433) @@ -2,10 +2,8 @@ Released into the Public Domain by Ulrich Drepper <drep...@redhat.com>. */ /* Windows VC++ port by Pierre Joye <pie...@php.net> */ -#ifndef PHP_WIN32 -# include "php.h" -# include "php_main.h" -#endif +#include "php.h" +#include "php_main.h" #include <errno.h> #include <limits.h> Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400,293502,293538 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400,293502,293538,293558 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400,293502,293538 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400,293502,293538,293558 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php