Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix Solaris builds of ext/sockets

Author: cmb69

NEWS

@@ -16,6 +16,9 @@ PHP                                                                        NEWS
 - Pcntl:
   . Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
 
+- Sockets:
+  . Fixed Solaris builds. (David Carlier)
+
 - SPL:
   . Fixed bug GH-8121 (SplFileObject - seek and key with csv file inconsistent).
     (cmb)

ext/sockets/conversions.c

@@ -1,3 +1,7 @@
+#ifdef __sun
+/* to enable 'new' ancillary data layout instead */
+# define _XPG4_2
+#endif
 #include "sockaddr_conv.h"
 #include "conversions.h"
 #include "sendrecvmsg.h" /* for ancillary registry */

ext/sockets/sendrecvmsg.c

@@ -14,6 +14,10 @@
    +----------------------------------------------------------------------+
  */
 
+#ifdef __sun
+/* to enable 'new' ancillary data layout instead */
+# define _XPG4_2
+#endif
 #include <php.h>
 #include "php_sockets.h"
 #include "sendrecvmsg.h"