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/mcrypt/mcrypt.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/mcrypt/mcrypt.c')
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 3a17d6dfa1..ebe968cf24 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -26,7 +26,7 @@ #if HAVE_LIBMCRYPT -#if PHP_WIN32 +#ifdef PHP_WIN32 # include "win32/winutil.h" #endif @@ -1376,7 +1376,7 @@ PHP_FUNCTION(mcrypt_create_iv) iv = ecalloc(size + 1, 1); if (source == RANDOM || source == URANDOM) { -#if PHP_WIN32 +#ifdef PHP_WIN32 /* random/urandom equivalent on Windows */ BYTE *iv_b = (BYTE *) iv; if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){ |