diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:47:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:47:42 +0800 |
| commit | 65d77812fcc0275aed58fd74b8d17d09a7e21ef2 (patch) | |
| tree | 2ca8b2dc909ab2d88a949b6846cf128e9cb21538 /ext/standard/php_crypt_r.c | |
| parent | d65459f4eb764a77668a8f870ea85f3bbd12a13c (diff) | |
| parent | 4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 (diff) | |
| download | php-git-65d77812fcc0275aed58fd74b8d17d09a7e21ef2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed condition check
Diffstat (limited to 'ext/standard/php_crypt_r.c')
| -rw-r--r-- | ext/standard/php_crypt_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index ea2ea74fbe..d3ecc002a8 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -37,7 +37,7 @@ #include <string.h> -#if PHP_WIN32 +#ifdef PHP_WIN32 # include <windows.h> # include <Wincrypt.h> #endif @@ -123,7 +123,7 @@ to64(char *s, int32_t v, int n) } } -#if PHP_WIN32 +#ifdef PHP_WIN32 char * php_md5_crypt_r(const char *pw, const char *salt, char *out) { HCRYPTPROV hCryptProv; HCRYPTHASH ctx, ctx1; |