archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  Fix build
  crc32 mac build fix
This commit is contained in:
Nikita Popov 2021-02-01 09:46:39 +01:00
commit 800685e2f9
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/soap/php_sdl.c
View file

@ -313,7 +313,7 @@ void sdl_restore_uri_credentials(sdlCtx *ctx)
ctx->context = NULL; 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) static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
{ {

1
ext/standard/crc32.c
View file

@ -43,6 +43,7 @@ static inline int has_crc32_insn() {
size_t reslen = sizeof(res); size_t reslen = sizeof(res);
if (sysctlbyname("hw.optional.armv8_crc32", &res, &reslen, NULL, 0) < 0) if (sysctlbyname("hw.optional.armv8_crc32", &res, &reslen, NULL, 0) < 0)
res = 0; res = 0;
return res;
# else # else
res = 0; res = 0;
return res; return res;