From d65459f4eb764a77668a8f870ea85f3bbd12a13c Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 10 Apr 2017 14:42:48 +0800 Subject: [PATCH 1/3] another place --- main/php.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/php.h b/main/php.h index c138e5c0fad..9b1c8b9b2b5 100644 --- a/main/php.h +++ b/main/php.h @@ -256,7 +256,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 From 4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 10 Apr 2017 14:47:24 +0800 Subject: [PATCH 2/3] Fixed condition check --- ext/bcmath/libbcmath/src/config.h | 2 +- ext/gd/gdcache.c | 2 +- ext/mcrypt/mcrypt.c | 4 ++-- ext/sockets/multicast.c | 2 +- ext/standard/crypt_freesec.h | 2 +- ext/standard/crypt_sha256.c | 2 +- ext/standard/crypt_sha512.c | 2 +- ext/standard/dl.c | 2 +- ext/standard/html.c | 2 +- ext/standard/password.c | 2 +- ext/standard/php_crypt_r.c | 4 ++-- ext/standard/random.c | 4 ++-- main/fopen_wrappers.c | 2 +- main/php_ini.c | 6 +++--- main/streams/plain_wrapper.c | 6 +++--- sapi/phpdbg/phpdbg_prompt.c | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ext/bcmath/libbcmath/src/config.h b/ext/bcmath/libbcmath/src/config.h index cc29a15f959..100163d3830 100644 --- 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 diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c index e6f9ce1b44b..80723ae1e80 100644 --- 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 diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index c589b40fab5..5e32c3230ac 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){ diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 40335a186e0..4e5d399a871 100644 --- 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 index 860462a2dd6..288c216b99b 100644 --- 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 index 38c285942e2..6a380bdf6af 100644 --- 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 index 3cef9a34375..33731829210 100644 --- 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 index cef9716b234..0c08caa115a 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -131,7 +131,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 index 74db565dcdc..039cda7c980 100644 --- 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 diff --git a/ext/standard/password.c b/ext/standard/password.c index 4657f6a5f82..33c6e5c718f 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -32,7 +32,7 @@ #include "info.h" #include "php_random.h" -#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 index cddf1d33e3d..01627337f16 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -37,7 +37,7 @@ #include -#if PHP_WIN32 +#ifdef PHP_WIN32 # include # include #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 index 1434450039b..b52566cef0f 100644 --- 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 index 17dd27a6ff3..e1f89ce5cc0 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -505,7 +505,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_ini.c b/main/php_ini.c index 99f11d5f251..79c9d093213 100644 --- 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 index 39c629b458f..9643617aefa 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1302,7 +1302,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; @@ -1329,11 +1329,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_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 0b4e69ca0e6..9fe4fc7885b 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1257,7 +1257,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); From 9398f15efd58899df21f5e0cf032b8881fe71f3f Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 10 Apr 2017 14:48:31 +0800 Subject: [PATCH 3/3] Fixed condition check --- sapi/phpdbg/phpdbg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 2a22251219a..ef3b017b6d8 100644 --- 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 -#elif PHP_WIN32 +#elif defined(PHP_WIN32) # include "win32/signal.h" #endif #include "SAPI.h"