summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2017-04-10 14:47:24 +0800
committerXinchen Hui <laruence@gmail.com>2017-04-10 14:47:24 +0800
commit4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 (patch)
treeceffd46146f8a14f0fc69099ec3f829a9a6da8c0
parent66411ee62ee8bd5e015c901092014dd9229fca01 (diff)
downloadphp-git-4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0.tar.gz
Fixed condition check
-rw-r--r--ext/bcmath/libbcmath/src/config.h2
-rw-r--r--ext/gd/gdcache.c2
-rw-r--r--ext/mcrypt/mcrypt.c4
-rw-r--r--ext/sockets/multicast.c2
-rw-r--r--ext/standard/crypt_freesec.h2
-rw-r--r--ext/standard/crypt_sha256.c2
-rw-r--r--ext/standard/crypt_sha512.c2
-rw-r--r--ext/standard/dl.c2
-rw-r--r--ext/standard/html.c2
-rw-r--r--ext/standard/password.c2
-rw-r--r--ext/standard/php_crypt_r.c4
-rw-r--r--ext/standard/random.c4
-rw-r--r--main/fopen_wrappers.c2
-rw-r--r--main/php_ini.c6
-rw-r--r--main/streams/plain_wrapper.c6
-rw-r--r--sapi/phpdbg/phpdbg_prompt.c2
16 files changed, 23 insertions, 23 deletions
diff --git a/ext/bcmath/libbcmath/src/config.h b/ext/bcmath/libbcmath/src/config.h
index cc29a15f95..100163d383 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 <php_config.h>
diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c
index e6f9ce1b44..80723ae1e8 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 <php_config.h>
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index c589b40fab..5e32c3230a 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 40335a186e..4e5d399a87 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 860462a2dd..288c216b99 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 38c285942e..6a380bdf6a 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 3cef9a3437..3373182921 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 cef9716b23..0c08caa115 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 74db565dcd..039cda7c98 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 <php_config.h>
diff --git a/ext/standard/password.c b/ext/standard/password.c
index 4657f6a5f8..33c6e5c718 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 cddf1d33e3..01627337f1 100644
--- 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
index 1434450039..b52566cef0 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 17dd27a6ff..e1f89ce5cc 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 99f11d5f25..79c9d09321 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 39c629b458..9643617aef 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 0b4e69ca0e..9fe4fc7885 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);