com php-src: Merge branch 'PHP-7.1': ext/standard/dl.c ext/standard/html.c ext/standard/password.c ext/standard/php_crypt_r.c ext/ standard/random.c main/fopen_wrappers.c main/php.h main/streams/plain_wrapper.c sapi/phpdbg/phpdbg_prom pt.c

Commit:    696bd37e6757d77dc7ed44f3ea6451944ebaba96
Author:    Xinchen Hui <[email protected]>         Mon, 10 Apr 2017 14:49:13 +0800
Parents:   4e9f0a80b9748c03e7bae6339ec051b815f5a569 9398f15efd58899df21f5e0cf032b8881fe71f3f
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=696bd37e6757d77dc7ed44f3ea6451944ebaba96

Log:
Merge branch 'PHP-7.1'

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

Conflicts:
	ext/mcrypt/mcrypt.c

Changed paths:
  MM  ext/standard/dl.c
  MM  ext/standard/html.c
  MM  ext/standard/password.c
  MM  ext/standard/php_crypt_r.c
  MM  ext/standard/random.c
  MM  main/fopen_wrappers.c
  MM  main/php.h
  MM  main/streams/plain_wrapper.c
  MM  sapi/phpdbg/phpdbg_prompt.c


Diff:
diff --cc ext/standard/password.c
index d814757,58f06f8..2d04bad
--- 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