Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Include relevant system headers before defining fallbacks

Author: cmb69

NEWS

@@ -41,6 +41,7 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already
     locked)). (Jakub Zelenka)
+  . Fixed bug GH-17112 (Macro redefinitions). (cmb, nielsdos)
 
 - GD:
   . Fixed bug GH-16255 (Unexpected nan value in ext/gd/libgd/gd_filter.c).
@@ -53,6 +54,9 @@ PHP                                                                        NEWS
 - Iconv:
   . Fixed bug GH-17047 (UAF on iconv filter failure). (nielsdos)
 
+- MBString:
+  . Fixed bug GH-17112 (Macro redefinitions). (nielsdos, cmb)
+
 - Opcache:
   . opcache_get_configuration() properly reports jit_prof_threshold. (cmb)
   . Fixed bug GH-17140 (Assertion failure in JIT trace exit with

sapi/fpm/fpm/fpm_config.h

@@ -2,6 +2,16 @@
 
 #include <php_config.h>
 
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
 /* Solaris does not have it */
 #ifndef INADDR_NONE
 # define INADDR_NONE (-1)