php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gate SOCK_DCCP behind its own ifdef (#15031)

Browse Source 
AIX 7.1 has SOCK_CONN_DGRAM, but not SOCK_DCCP; the previous change
conflated the availability between the two definitions. Add an
additional #ifdef for this.
This commit is contained in:
Calvin Buckley
2024-07-19 16:41:29 -03:00
committed by GitHub
parent 6857c7c8d6
commit a63fd2a95a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/sockets/sockets.stub.php
View File

@@ -59,8 +59,10 @@ const SOCK_RDM = UNKNOWN;
* @cvalue SOCK_CONN_DGRAM
*/
const SOCK_CONN_DGRAM = UNKNOWN;
#endif
#ifdef SOCK_DCCP
/**
* is an alias of SOCK_CONN_DGRAM
* is an alias of SOCK_CONN_DGRAM on some platforms
* @var int
* @cvalue SOCK_DCCP
*/

4
ext/sockets/sockets_arginfo.h generated
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 3a3ee52b0773e96ead463517e6d9a68c2b385b92 */
* Stub hash: e43c00bcb6af1c0a20a92162457883e3a33b4a53 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_select, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1)
@@ -350,7 +350,7 @@ static void register_sockets_symbols(int module_number)
#if defined(SOCK_CONN_DGRAM)
REGISTER_LONG_CONSTANT("SOCK_CONN_DGRAM", SOCK_CONN_DGRAM, CONST_PERSISTENT);
#endif
#if defined(SOCK_CONN_DGRAM)
#if defined(SOCK_DCCP)
REGISTER_LONG_CONSTANT("SOCK_DCCP", SOCK_DCCP, CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("MSG_OOB", MSG_OOB, CONST_PERSISTENT);