Fix Solaris builds of ext/sockets

devnexen · cmb69 · commit 7eb972c45693 · 2022-03-10T14:48:08.000+01:00
We enable the proper ancillary data handling layout and API. Closes GH-7859.
diff --git a/NEWS b/NEWS
@@ -13,6 +13,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)
diff --git a/ext/sockets/conversions.c b/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 */
diff --git a/ext/sockets/sendrecvmsg.c b/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"
