From 12d08db91398e6a9f532bdad8cf5a0699b16d2a6 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sat, 30 Jan 2021 09:45:01 +0000 Subject: crc32 mac build fix Closes GH-6651. --- ext/standard/crc32.c | 1 + 1 file changed, 1 insertion(+) 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; -- cgit v1.2.1 From ab8177de2c89672e63a7a1ccef4df8f7bf34fbd2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 1 Feb 2021 09:46:17 +0100 Subject: Fix build --- ext/soap/php_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index d4dd8f090a..8d5e7335e1 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -315,7 +315,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) { -- cgit v1.2.1