Merge branch 'PHP-8.5'

* PHP-8.5:
  Fix GH-20492: mbstring compile warning due to non-strings
  Fix GH-20491: SLES15 compile error with mbstring oniguruma

Author: ndossche

ext/mbstring/php_onig_compat.h

@@ -5,4 +5,10 @@
 #define regex_t                     php_mb_regex_t
 #define re_registers                php_mb_re_registers
 
+/* Required for some distros that conditionally override PV_.
+ * As we're in C99 this header is always available. */
+#ifndef HAVE_STDARG_H
+# define HAVE_STDARG_H
+#endif
+
 #endif /* _PHP_ONIG_COMPAT_H */