From 6ab149b5d329557fbb3a4a498f6b68b66c7aab0c Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 21 Aug 2021 17:43:55 +0100 Subject: [PATCH] evlib: remove PREPARE_DELETION as cruft --- include/libwebsockets/lws-eventlib-exports.h | 2 -- lib/core-net/pollfd.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/libwebsockets/lws-eventlib-exports.h b/include/libwebsockets/lws-eventlib-exports.h index ceb885c3f..5d01caa9d 100644 --- a/include/libwebsockets/lws-eventlib-exports.h +++ b/include/libwebsockets/lws-eventlib-exports.h @@ -34,8 +34,6 @@ enum { LWS_EV_WRITE = (1 << 1), LWS_EV_START = (1 << 2), LWS_EV_STOP = (1 << 3), - - LWS_EV_PREPARE_DELETION = (1u << 31), }; struct lws_event_loop_ops { diff --git a/lib/core-net/pollfd.c b/lib/core-net/pollfd.c index ae412090e..e5a8ac9b2 100644 --- a/lib/core-net/pollfd.c +++ b/lib/core-net/pollfd.c @@ -395,9 +395,8 @@ __remove_wsi_socket_from_fds(struct lws *wsi) assert(m == LWS_NO_FDS_POS || (m >= 0 && (unsigned int)m < pt->fds_count)); if (context->event_loop_ops->io) - context->event_loop_ops->io(wsi, - LWS_EV_STOP | LWS_EV_READ | LWS_EV_WRITE | - LWS_EV_PREPARE_DELETION); + context->event_loop_ops->io(wsi, LWS_EV_STOP | LWS_EV_READ | + LWS_EV_WRITE); /* lwsl_notice("%s: wsi=%s, skt=%d, fds pos=%d, end guy pos=%d, endfd=%d\n", __func__, lws_wsi_tag(wsi), wsi->desc.sockfd, wsi->position_in_fds_table,