diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:49:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:49:13 +0800 |
| commit | 696bd37e6757d77dc7ed44f3ea6451944ebaba96 (patch) | |
| tree | 94fcb38264a7103e7fc5892d155006c5306da68b /ext/standard/php_crypt_r.c | |
| parent | 4e9f0a80b9748c03e7bae6339ec051b815f5a569 (diff) | |
| parent | 9398f15efd58899df21f5e0cf032b8881fe71f3f (diff) | |
| download | php-git-696bd37e6757d77dc7ed44f3ea6451944ebaba96.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
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 4f0c26acc8..fc5a46a8c3 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; |