diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-01 09:46:39 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-01 09:46:39 +0100 |
| commit | 800685e2f948f03d2f13152a965832c766c1a38c (patch) | |
| tree | 0c440db5cc847087533feaddc80adfdf7d20b42d | |
| parent | f2994786f3d5f01944202d8757bf3f6ff92a8261 (diff) | |
| parent | c72957b409c857d4039c4d599b03206f0daa00ab (diff) | |
| download | php-git-800685e2f948f03d2f13152a965832c766c1a38c.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix build
crc32 mac build fix
| -rw-r--r-- | ext/soap/php_sdl.c | 2 | ||||
| -rw-r--r-- | ext/standard/crc32.c | 1 |
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; |