From: Johannes Schlüter <johannes@php.net>
Date: Thu, 11 Feb 2010 17:53:22 +0000 (+0000)
Subject: merge r293409: Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99
X-Git-Tag: php-5.3.2RC2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e9d95d447b51874681e62ba5719c4598926a1f5;p=php

merge r293409: Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99
set on some systems. (dsp)
---

diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c
index b2f64f2737..3e234cee91 100644
--- a/ext/standard/crypt_sha256.c
+++ b/ext/standard/crypt_sha256.c
@@ -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 * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b
 	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 @@ char * php_sha256_crypt_r(const char *key, const char *salt, char *buffer, int b
 		if (*endp == '$') {
 			salt = endp + 1;
 			rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
-			rounds_custom = true;
+			rounds_custom = 1;
 		}
 	}
 
diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c
index 267cd6e594..ba9a639180 100644
--- a/ext/standard/crypt_sha512.c
+++ b/ext/standard/crypt_sha512.c
@@ -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 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
 	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 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
 		if (*endp == '$') {
 			salt = endp + 1;
 			rounds = MAX(ROUNDS_MIN, MIN(srounds, ROUNDS_MAX));
-			rounds_custom = true;
+			rounds_custom = 1;
 		}
 	}