Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit c72957b409c8 · 2021-02-01T09:46:27.000+01:00
* PHP-7.4:
  Fix build
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ void sdl_restore_uri_credentials(sdlCtx *ctx)`
`313`	`313`	`ctx->context = NULL;`
`314`	`314`	`}`
`315`	`315`
`316`		`-#define SAFE_STR(a) ((a)?a:"")`
	`316`	`+#define SAFE_STR(a) ((a)?((const char *)a):"")`
`317`	`317`
`318`	`318`	`static void load_wsdl_ex(zval this_ptr, char struri, sdlCtx *ctx, int include)`
`319`	`319`	`{`