johannes Thu, 11 Feb 2010 17:53:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=294894
Log:
merge r293409: Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99
set on some systems. (dsp)
Bug: http://bugs.php.net/50496 (Closed) Use of stdbool.h is valid only in a
c99 compilation environment.
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,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292620,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293409,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293721,293726-293728,293730,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724,294762,294814,294816,294825,294849,294854-294855
/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-11 17:36:40 UTC (rev 294893)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha256.c 2010-02-11 17:53:22 UTC (rev 294894)
@@ -10,7 +10,6 @@
#ifdef PHP_WIN32
# include win32/php_stdint.h
-# include win32/php_stdbool.h
# define __alignof__ __alignof
# define alloca _alloca
#else
@@ -368,7 +367,7 @@
char *s_bytes;
/* Default number of rounds. */
size_t rounds = ROUNDS_DEFAULT;
- bool rounds_custom = false;
+ zend_bool rounds_custom = 0;
/* Find beginning of salt string. The prefix should normally always
be present. Just in case it is not. */
@@ -384,7 +383,7 @@
if (*endp == '$') {
salt = endp + 1;
rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
- rounds_custom = true;
+ rounds_custom = 1;
}
}
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-11 17:36:40 UTC (rev 294893)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/crypt_sha512.c 2010-02-11 17:53:22 UTC (rev 294894)
@@ -9,7 +9,6 @@
#include limits.h
#ifdef PHP_WIN32
# include win32/php_stdint.h
-# include win32/php_stdbool.h
# define __alignof__ __alignof
# define alloca _alloca
#else
@@ -395,7 +394,7 @@
char *s_bytes;
/* Default number of rounds. */
size_t rounds = ROUNDS_DEFAULT;
- bool rounds_custom = false;
+ zend_bool rounds_custom = 0;
/* Find beginning of salt string. The prefix should normally always
be present. Just in case it is not. */
@@ -412,7 +411,7 @@
if (*endp == '$') {
salt = endp + 1;
rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
- rounds_custom = true;
+ rounds_custom = 1;
}
}
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified:
