Merge branch 'PHP-7.1'

laruence · laruence · commit 696bd37e6757 · 2017-04-10T14:49:13.000+08:00
* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
diff --git a/ext/bcmath/libbcmath/src/config.h b/ext/bcmath/libbcmath/src/config.h
@@ -1,4 +1,4 @@
-#if PHP_WIN32
+#ifdef PHP_WIN32
 #include "../../../../main/config.w32.h"
 #else
 #include <php_config.h>
diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c
@@ -39,7 +39,7 @@
 #include "php.h"
 
 /* This just seems unessacary */
-#if PHP_WIN32
+#ifdef PHP_WIN32
 #define ENABLE_GD_TTF
 #else
 #include <php_config.h>
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
@@ -627,7 +627,7 @@ static int _php_source_op_to_ipv4_op(enum source_op sop)
 
 #endif /* HAS_MCAST_EXT */
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr)
 {
 	MIB_IPADDRTABLE *addr_table;
diff --git a/ext/standard/crypt_freesec.h b/ext/standard/crypt_freesec.h
@@ -3,7 +3,7 @@
 #ifndef _CRYPT_FREESEC_H
 #define _CRYPT_FREESEC_H
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 # ifndef inline
 # define inline __inline
 # endif
diff --git a/ext/standard/crypt_sha256.c b/ext/standard/crypt_sha256.c
@@ -68,7 +68,7 @@ struct sha256_ctx {
 	char buffer[128]; /* NB: always correctly aligned for uint32_t.  */
 };
 
-#if PHP_WIN32 || (!defined(WORDS_BIGENDIAN))
+#if defined(PHP_WIN32) || (!defined(WORDS_BIGENDIAN))
 # define SWAP(n) \
     (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
 #else
diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c
@@ -63,7 +63,7 @@ struct sha512_ctx
 };
 
 
-#if PHP_WIN32 || (!defined(WORDS_BIGENDIAN))
+#if defined(PHP_WIN32) || (!defined(WORDS_BIGENDIAN))
 # define SWAP(n) \
   (((n) << 56)					\
    | (((n) & 0xff00) << 40)			\
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -122,7 +122,7 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
 	/* load dynamic symbol */
 	handle = DL_LOAD(libpath);
 	if (!handle) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
 		char *err = GET_DL_ERROR();
 		if (err && (*err != '\0')) {
 			php_error_docref(NULL, error_type, "Unable to load dynamic library '%s' - %s", libpath, err);
diff --git a/ext/standard/html.c b/ext/standard/html.c
@@ -39,7 +39,7 @@
  */
 
 #include "php.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
 #include "config.w32.h"
 #else
 #include <php_config.h>
diff --git a/ext/standard/password.c b/ext/standard/password.c
@@ -35,7 +35,7 @@
 #include "argon2.h"
 #endif
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 #include "win32/winutil.h"
 #endif
 
diff --git 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;
diff --git a/ext/standard/random.c b/ext/standard/random.c
@@ -27,7 +27,7 @@
 #include "zend_exceptions.h"
 #include "php_random.h"
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 # include "win32/winutil.h"
 #endif
 #ifdef __linux__
@@ -83,7 +83,7 @@ PHP_MSHUTDOWN_FUNCTION(random)
 /* {{{ */
 PHPAPI int php_random_bytes(void *bytes, size_t size, zend_bool should_throw)
 {
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	/* Defer to CryptGenRandom on Windows */
 	if (php_win32_get_random_bytes(bytes, size) == FAILURE) {
 		if (should_throw) {
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
@@ -501,7 +501,7 @@ PHPAPI zend_string *php_resolve_path(const char *filename, int filename_length,
 	     (IS_SLASH(filename[1]) ||
 	      ((filename[1] == '.') && IS_SLASH(filename[2])))) ||
 	    IS_ABSOLUTE_PATH(filename, filename_length) ||
-#if PHP_WIN32
+#ifdef PHP_WIN32
 		/* This should count as an absolute local path as well, however
 		   IS_ABSOLUTE_PATH doesn't care about this path form till now. It
 		   might be a big thing to extend, thus just a local handling for
diff --git a/main/php.h b/main/php.h
@@ -323,7 +323,7 @@ END_EXTERN_C()
 #define STR_PRINT(str)	((str)?(str):"")
 
 #ifndef MAXPATHLEN
-# if PHP_WIN32
+# ifdef PHP_WIN32
 #  include "win32/ioutil.h"
 #  define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN
 # elif PATH_MAX
diff --git a/main/php_ini.c b/main/php_ini.c
@@ -804,11 +804,11 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len)
 	zval *tmp2;
 	char *ptr;
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	char path_bak[MAXPATHLEN];
 #endif
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	/* MAX_PATH is \0-terminated, path_len == MAXPATHLEN would overrun path_bak */
 	if (path_len >= MAXPATHLEN) {
 #else
@@ -817,7 +817,7 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len)
 		return;
 	}
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	memcpy(path_bak, path, path_len);
 	path_bak[path_len] = 0;
 	TRANSLATE_SLASHES_LOWER(path_bak);
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
@@ -1310,7 +1310,7 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, i
 		return 0;
 	}
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	if (!php_win32_check_trailing_space(url, (int)strlen(url))) {
 		php_error_docref1(NULL, url, E_WARNING, "%s", strerror(ENOENT));
 		return 0;
@@ -1337,11 +1337,11 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url
 #endif
 	mode_t mode;
 	int ret = 0;
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	int url_len = (int)strlen(url);
 #endif
 
-#if PHP_WIN32
+#ifdef PHP_WIN32
 	if (!php_win32_check_trailing_space(url, url_len)) {
 		php_error_docref1(NULL, url, E_WARNING, "%s", strerror(ENOENT));
 		return 0;
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
@@ -48,7 +48,7 @@
 #include "zend_signal.h"
 #if !defined(_WIN32) && !defined(ZEND_SIGNALS) && defined(HAVE_SIGNAL_H)
 #	include <signal.h>
-#elif PHP_WIN32
+#elif defined(PHP_WIN32)
 #	include "win32/signal.h"
 #endif
 #include "SAPI.h"
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
@@ -1307,7 +1307,7 @@ PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name)
 	handle = DL_LOAD(*path);
 
 	if (!handle) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
 		char *err = GET_DL_ERROR();
 		if (err && err[0]) {
 			phpdbg_error("dl", "type=\"unknown\"", "%s", err);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if PHP_WIN32`
	`1`	`+#ifdef PHP_WIN32`
`2`	`2`	`#include "../../../../main/config.w32.h"`
`3`	`3`	`#else`
`4`	`4`	`#include <php_config.h>`
Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ static int _php_source_op_to_ipv4_op(enum source_op sop)`
`627`	`627`
`628`	`628`	`#endif /* HAS_MCAST_EXT */`
`629`	`629`
`630`		`-#if PHP_WIN32`
	`630`	`+#ifdef PHP_WIN32`
`631`	`631`	`int php_if_index_to_addr4(unsigned if_index, php_socket php_sock, struct in_addr out_addr)`
`632`	`632`	`{`
`633`	`633`	`MIB_IPADDRTABLE *addr_table;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`
`38`	`38`	`#include <string.h>`
`39`	`39`
`40`		`-#if PHP_WIN32`
	`40`	`+#ifdef PHP_WIN32`
`41`	`41`	`# include <windows.h>`
`42`	`42`	`# include <Wincrypt.h>`
`43`	`43`	`#endif`
`@@ -123,7 +123,7 @@ to64(char *s, int32_t v, int n)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`-#if PHP_WIN32`
	`126`	`+#ifdef PHP_WIN32`
`127`	`127`	`char * php_md5_crypt_r(const char pw, const char salt, char *out) {`
`128`	`128`	`HCRYPTPROV hCryptProv;`
`129`	`129`	`HCRYPTHASH ctx, ctx1;`