mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Soria Parra 2010-01-11 16:22:12 +00:00
parent 9b8d026d86
commit 33fc7d77d7
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/standard/crypt_sha256.c
View File

@ -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;
}
}

6
ext/standard/crypt_sha512.c
View File

@ -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;
}
}