From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 28 Apr 2020 13:25:35 +0000 (+0200)
Subject: Fix ifunc resolver return type warning
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc1574e0a0097e006acd783acff01f6537b79185;p=php

Fix ifunc resolver return type warning
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 33de160aa8..c06de62a80 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -3673,9 +3673,12 @@ void php_stripslashes_default(zend_string *str);
 PHPAPI zend_string *php_addslashes(zend_string *str) __attribute__((ifunc("resolve_addslashes")));
 PHPAPI void php_stripslashes(zend_string *str) __attribute__((ifunc("resolve_stripslashes")));
 
+typedef zend_string *(*php_addslashes_func_t)(zend_string *);
+typedef void (*php_stripslashes_func_t)(zend_string *);
+
 ZEND_NO_SANITIZE_ADDRESS
 ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
-static void *resolve_addslashes() {
+static php_addslashes_func_t resolve_addslashes() {
 	if (zend_cpu_supports_sse42()) {
 		return php_addslashes_sse42;
 	}
@@ -3684,7 +3687,7 @@ static void *resolve_addslashes() {
 
 ZEND_NO_SANITIZE_ADDRESS
 ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
-static void *resolve_stripslashes() {
+static php_stripslashes_func_t resolve_stripslashes() {
 	if (zend_cpu_supports_sse42()) {
 		return php_stripslashes_sse42;
 	}