summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/soap/php_sdl.c2
-rw-r--r--ext/standard/crc32.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 143e406916..bcc72cce8a 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -313,7 +313,7 @@ void sdl_restore_uri_credentials(sdlCtx *ctx)
ctx->context = NULL;
}
-#define SAFE_STR(a) ((a)?a:"")
+#define SAFE_STR(a) ((a)?((const char *)a):"")
static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
{
diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c
index 83f4314b69..659c9f0906 100644
--- a/ext/standard/crc32.c
+++ b/ext/standard/crc32.c
@@ -43,6 +43,7 @@ static inline int has_crc32_insn() {
size_t reslen = sizeof(res);
if (sysctlbyname("hw.optional.armv8_crc32", &res, &reslen, NULL, 0) < 0)
res = 0;
+ return res;
# else
res = 0;
return res;