diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:06:52 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:06:52 +0100 |
| commit | e24dcf97f1af7165d14ff3f57f21c7c89225e1f7 (patch) | |
| tree | 60abfccec76ba16ad9c3a8b06847d0e254db214a /ext/standard/php_crypt_r.c | |
| parent | 5b013e7935efb73e27ebc7d40dce7ef9a3644b14 (diff) | |
| parent | 696bd37e6757d77dc7ed44f3ea6451944ebaba96 (diff) | |
| download | php-git-e24dcf97f1af7165d14ff3f57f21c7c89225e1f7.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
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; |