Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix ext/sockets build on Haiku

Author: cmb69

NEWS

@@ -56,6 +56,7 @@ PHP                                                                        NEWS
 
 - Sockets:
   . Avoid void* arithmetic in sockets/multicast.c on NetBSD. (David Carlier)
+  . Fixed ext/sockets build on Haiku. (David Carlier)
 
 - Spl:
   . Fixed bug #75917 (SplFileObject::seek broken with CSV flags). (Aliaksandr

ext/sockets/multicast.c

@@ -718,7 +718,7 @@ int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_add
 		return SUCCESS;
 	}
 
-#if !defined(ifr_ifindex) && defined(ifr_index)
+#if !defined(ifr_ifindex) && (defined(ifr_index) || defined(__HAIKU__))
 #define ifr_ifindex ifr_index
 #endif
 

ext/sockets/sockets.c

@@ -463,7 +463,9 @@ static PHP_MINIT_FUNCTION(sockets)
 	REGISTER_LONG_CONSTANT("SOCK_DGRAM",	SOCK_DGRAM,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SOCK_RAW",		SOCK_RAW,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SOCK_SEQPACKET",SOCK_SEQPACKET, CONST_CS | CONST_PERSISTENT);
+#ifdef SOCK_RDM
 	REGISTER_LONG_CONSTANT("SOCK_RDM",		SOCK_RDM,		CONST_CS | CONST_PERSISTENT);
+#endif
 
 	REGISTER_LONG_CONSTANT("MSG_OOB",		MSG_OOB,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MSG_WAITALL",	MSG_WAITALL,	CONST_CS | CONST_PERSISTENT);