Use ZEND_CONTAINER_OF() in poll API

Author: iluuu1994

ext/standard/io_poll.c

@@ -68,11 +68,9 @@ typedef struct php_stream_poll_handle_data {
 } php_stream_poll_handle_data;
 
 /* Accessor macros */
-#define PHP_POLL_CONTEXT_OBJ_FROM_ZOBJ(_obj) \
-	((php_io_poll_context_object *) ((char *) (_obj) - offsetof(php_io_poll_context_object, std)))
+#define PHP_POLL_CONTEXT_OBJ_FROM_ZOBJ(_obj) ZEND_CONTAINER_OF(_obj, php_io_poll_context_object, std)
 
-#define PHP_POLL_WATCHER_OBJ_FROM_ZOBJ(_obj) \
-	((php_io_poll_watcher_object *) ((char *) (_obj) - offsetof(php_io_poll_watcher_object, std)))
+#define PHP_POLL_WATCHER_OBJ_FROM_ZOBJ(_obj) ZEND_CONTAINER_OF(_obj, php_io_poll_watcher_object, std)
 
 #define PHP_POLL_WATCHER_OBJ_FROM_ZV(_zv) PHP_POLL_WATCHER_OBJ_FROM_ZOBJ(Z_OBJ_P(_zv))
 #define PHP_POLL_CONTEXT_OBJ_FROM_ZV(_zv) PHP_POLL_CONTEXT_OBJ_FROM_ZOBJ(Z_OBJ_P(_zv))

main/php_poll.h

@@ -158,8 +158,7 @@ struct php_poll_handle_object {
 	zend_object std;
 };
 
-#define PHP_POLL_HANDLE_OBJ_FROM_ZOBJ(obj) \
-	((php_poll_handle_object *) ((char *) (obj) - offsetof(php_poll_handle_object, std)))
+#define PHP_POLL_HANDLE_OBJ_FROM_ZOBJ(obj) ZEND_CONTAINER_OF(obj, php_poll_handle_object, std)
 
 #define PHP_POLL_HANDLE_OBJ_FROM_ZV(zv) PHP_POLL_HANDLE_OBJ_FROM_ZOBJ(Z_OBJ_P(zv))