dsp Mon, 11 Jan 2010 16:22:12 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=293409
Log: Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99 set on some systems. Bug: http://bugs.php.net/50496 (Open) Use of <stdbool.h> is valid only in a c99 compilation environment. Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c U php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c U php/php-src/trunk/ext/standard/crypt_sha256.c U php/php-src/trunk/ext/standard/crypt_sha512.c Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c 2010-01-11 15:26:50 UTC (rev 293408) +++ php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c 2010-01-11 16:22:12 UTC (rev 293409) @@ -12,7 +12,6 @@ #ifdef PHP_WIN32 # include "win32/php_stdint.h" -# include "win32/php_stdbool.h" # define __alignof__ __alignof # define alloca _alloca #else @@ -21,7 +20,6 @@ # elif HAVE_STDINT_H # include <stdint.h> # endif -# include <stdbool.h> #endif #include <stdio.h> @@ -364,7 +362,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. */ @@ -380,7 +378,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/ext/standard/crypt_sha512.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c 2010-01-11 15:26:50 UTC (rev 293408) +++ php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c 2010-01-11 16:22:12 UTC (rev 293409) @@ -11,7 +11,6 @@ #include <limits.h> #ifdef PHP_WIN32 # include "win32/php_stdint.h" -# include "win32/php_stdbool.h" # define __alignof__ __alignof # define alloca _alloca #else @@ -20,7 +19,6 @@ # elif HAVE_STDINT_H # include <stdint.h> # endif -# include <stdbool.h> #endif #include <stdio.h> @@ -391,7 +389,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. */ @@ -408,7 +406,7 @@ if (*endp == '$') { salt = endp + 1; rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX)); - rounds_custom = true; + rounds_custom = 1; } } Modified: php/php-src/trunk/ext/standard/crypt_sha256.c =================================================================== --- php/php-src/trunk/ext/standard/crypt_sha256.c 2010-01-11 15:26:50 UTC (rev 293408) +++ php/php-src/trunk/ext/standard/crypt_sha256.c 2010-01-11 16:22:12 UTC (rev 293409) @@ -12,7 +12,6 @@ #ifdef PHP_WIN32 # include "win32/php_stdint.h" -# include "win32/php_stdbool.h" # define __alignof__ __alignof # define alloca _alloca #else @@ -21,7 +20,6 @@ # elif HAVE_STDINT_H # include <stdint.h> # endif -# include <stdbool.h> #endif #include <stdio.h> @@ -357,7 +355,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. */ @@ -373,7 +371,7 @@ if (*endp == '$') { salt = endp + 1; rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX)); - rounds_custom = true; + rounds_custom = 1; } } Modified: php/php-src/trunk/ext/standard/crypt_sha512.c =================================================================== --- php/php-src/trunk/ext/standard/crypt_sha512.c 2010-01-11 15:26:50 UTC (rev 293408) +++ php/php-src/trunk/ext/standard/crypt_sha512.c 2010-01-11 16:22:12 UTC (rev 293409) @@ -11,7 +11,6 @@ #include <limits.h> #ifdef PHP_WIN32 # include "win32/php_stdint.h" -# include "win32/php_stdbool.h" # define __alignof__ __alignof # define alloca _alloca #else @@ -20,7 +19,6 @@ # elif HAVE_STDINT_H # include <stdint.h> # endif -# include <stdbool.h> #endif #include <stdio.h> @@ -384,7 +382,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. */ @@ -401,7 +399,7 @@ if (*endp == '$') { salt = endp + 1; rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX)); - rounds_custom = true; + rounds_custom = 1; } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
