summaryrefslogtreecommitdiff
path: root/ext/standard
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 /ext/standard
parent66411ee62ee8bd5e015c901092014dd9229fca01 (diff)
downloadphp-git-4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0.tar.gz
Fixed condition check
Diffstat (limited to 'ext/standard')
-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
8 files changed, 10 insertions, 10 deletions
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) {