Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99 set on some systems.

diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c
index 7e632de9f7bf61f89c566734d3860cf519855c5c..ea7883ab06bdc7933dc82f14de96df91f20d43b1 100644 (file)
--- a/ext/standard/crypt_sha256.c
+++ b/ext/standard/crypt_sha256.c
@@ -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 * 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.  */
@@ -380,7 +378,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 f339dbb8103e0f91c1ccd0d31874d01aa09d0f0f..22f7e7fa7920085715cffacb4a71db8bceb13e84 100644 (file)
--- a/ext/standard/crypt_sha512.c
+++ b/ext/standard/crypt_sha512.c
@@ -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 @@ 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.  */
@@ -408,7 +406,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;
                }
        }