From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 10 Apr 2017 06:49:13 +0000 (+0800)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~145^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=696bd37e6757d77dc7ed44f3ea6451944ebaba96;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
---

696bd37e6757d77dc7ed44f3ea6451944ebaba96
diff --cc ext/standard/password.c
index d814757d95,58f06f81f8..2d04badd1b
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@@ -31,11 -30,8 +31,11 @@@
  #include "zend_interfaces.h"
  #include "info.h"
  #include "php_random.h"
 +#if HAVE_ARGON2LIB
 +#include "argon2.h"
 +#endif
  
- #if PHP_WIN32
+ #ifdef PHP_WIN32
  #include "win32/winutil.h"
  #endif