Merge branch 'PHP-7.1'

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

Conflicts:
	ext/mcrypt/mcrypt.c

diff --cc ext/standard/dl.c
Simple merge

diff --cc ext/standard/html.c
Simple merge

diff --cc ext/standard/password.c
index d814757d9536de4587cddc7cef19fbb4a893ba84,58f06f81f82b1361a5eceeddb988eb25ab6bc06b..2d04badd1b08708c2cbc2cca94ede7ccc4db9347
--- 1/ext/standard/password.c
--- 2/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
  

diff --cc ext/standard/php_crypt_r.c
Simple merge

diff --cc ext/standard/random.c
Simple merge

diff --cc main/fopen_wrappers.c
Simple merge

diff --cc main/php.h
Simple merge

diff --cc main/streams/plain_wrapper.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge