diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-25 11:55:05 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-25 11:55:05 +0100 |
| commit | 2b7d5eddfcd95d687b6a0402c64a43e7c1540938 (patch) | |
| tree | 53c9ff33478658c6538f43af1847867b806dcaf9 /ext/sockets | |
| parent | 7db29d2186a8b6f623f96063a8a5c67e78b93720 (diff) | |
| parent | e074e029ee7b038aa67b559559da8a546d11236e (diff) | |
| download | php-git-2b7d5eddfcd95d687b6a0402c64a43e7c1540938.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
sockets: Fix variable/macro name collision on AIX
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/sendrecvmsg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c index f7b0b8bf51..e5dbc52fb1 100644 --- a/ext/sockets/sendrecvmsg.c +++ b/ext/sockets/sendrecvmsg.c @@ -295,8 +295,9 @@ PHP_FUNCTION(socket_cmsg_space) } if (entry->var_el_size > 0) { - size_t rem_size = ZEND_LONG_MAX - entry->size; - size_t n_max = rem_size / entry->var_el_size; + /* Leading underscore to avoid symbol collision on AIX. */ + size_t _rem_size = ZEND_LONG_MAX - entry->size; + size_t n_max = _rem_size / entry->var_el_size; size_t size = entry->size + n * entry->var_el_size; size_t total_size = CMSG_SPACE(size); if (n > n_max /* zend_long overflow */ |