Commit 6e989d23d5e for php.net
commit 6e989d23d5e46d7abb85064f3bf660cf87b50e3b
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date: Thu Jun 18 20:05:49 2026 +0200
Name all unnamed structs in main/poll
diff --git a/ext/standard/io_poll.c b/ext/standard/io_poll.c
index 693f72eaee7..4bb7f6a8068 100644
--- a/ext/standard/io_poll.c
+++ b/ext/standard/io_poll.c
@@ -44,7 +44,7 @@ static zend_object_handlers php_io_poll_watcher_object_handlers;
static zend_object_handlers php_io_poll_handle_object_handlers;
/* Watcher object structure */
-typedef struct {
+typedef struct php_io_poll_watcher_object {
php_poll_handle_object *handle;
uint32_t watched_events;
uint32_t triggered_events;
@@ -55,14 +55,14 @@ typedef struct {
} php_io_poll_watcher_object;
/* Context object structure */
-typedef struct {
+typedef struct php_io_poll_context_object {
php_poll_ctx *ctx;
HashTable *watchers; /* Maps handle pointer -> watcher object */
zend_object std;
} php_io_poll_context_object;
/* Stream poll handle specific data */
-typedef struct {
+typedef struct php_stream_poll_handle_data {
php_stream *stream;
zend_resource *res;
} php_stream_poll_handle_data;
diff --git a/main/poll/poll_backend_epoll.c b/main/poll/poll_backend_epoll.c
index b0dbc4c7dbc..685339da77d 100644
--- a/main/poll/poll_backend_epoll.c
+++ b/main/poll/poll_backend_epoll.c
@@ -18,7 +18,7 @@
#include <sys/epoll.h>
-typedef struct {
+typedef struct epoll_backend_data {
int epoll_fd;
struct epoll_event *events;
int events_capacity;
diff --git a/main/poll/poll_backend_eventport.c b/main/poll/poll_backend_eventport.c
index f3bb3fa66e3..35e7c61326f 100644
--- a/main/poll/poll_backend_eventport.c
+++ b/main/poll/poll_backend_eventport.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <errno.h>
-typedef struct {
+typedef struct eventport_backend_data {
int port_fd;
port_event_t *events;
int events_capacity;
@@ -212,7 +212,7 @@ static zend_result eventport_backend_remove(php_poll_ctx *ctx, int fd)
}
/* Callback context for associating fds */
-typedef struct {
+typedef struct eventport_associate_ctx {
eventport_backend_data_t *backend_data;
php_poll_ctx *ctx;
bool has_error;
diff --git a/main/poll/poll_backend_kqueue.c b/main/poll/poll_backend_kqueue.c
index 9a654c716d5..3d8e1feb473 100644
--- a/main/poll/poll_backend_kqueue.c
+++ b/main/poll/poll_backend_kqueue.c
@@ -27,7 +27,7 @@
#define KQUEUE_FD_GARBAGE_WRITE (1 << 3) /* Write filter fired, needs read cleanup */
#define KQUEUE_FD_HAS_GARBAGE (KQUEUE_FD_GARBAGE_READ | KQUEUE_FD_GARBAGE_WRITE)
-typedef struct {
+typedef struct kqueue_backend_data {
int kqueue_fd;
struct kevent *events;
int events_capacity;
diff --git a/main/poll/poll_backend_poll.c b/main/poll/poll_backend_poll.c
index 311c48529bc..cca81b6fc4f 100644
--- a/main/poll/poll_backend_poll.c
+++ b/main/poll/poll_backend_poll.c
@@ -16,7 +16,7 @@
#ifndef PHP_WIN32
-typedef struct {
+typedef struct poll_backend_data {
php_poll_fd_table *fd_table;
struct pollfd *temp_fds;
int temp_fds_capacity;
@@ -162,7 +162,7 @@ static zend_result poll_backend_remove(php_poll_ctx *ctx, int fd)
}
/* Context for building struct pollfd array */
-typedef struct {
+typedef struct poll_build_context {
struct pollfd *fds;
int index;
} poll_build_context;
diff --git a/main/poll/poll_backend_wsapoll.c b/main/poll/poll_backend_wsapoll.c
index d8135d7f32a..101a7cfe0e4 100644
--- a/main/poll/poll_backend_wsapoll.c
+++ b/main/poll/poll_backend_wsapoll.c
@@ -19,7 +19,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
-typedef struct {
+typedef struct wsapoll_backend_data {
php_poll_fd_table *fd_table;
WSAPOLLFD *temp_fds;
int temp_fds_capacity;
@@ -167,7 +167,7 @@ static zend_result wsapoll_backend_remove(php_poll_ctx *ctx, int fd)
}
/* Context for building WSAPOLLFD array */
-typedef struct {
+typedef struct wsapoll_build_context {
WSAPOLLFD *fds;
int index;
} wsapoll_build_context;