From d6a0b27fc8768907b766d4dc9b0265d6ae464813 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 2 Dec 2018 03:08:34 +0100 Subject: [PATCH] websocket: now supported in C++ web code --- lib/web.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web.cpp b/lib/web.cpp index 0be7fc262..b5a72487a 100644 --- a/lib/web.cpp +++ b/lib/web.cpp @@ -64,7 +64,7 @@ lws_protocols protocols[] = { .rx_buffer_size = 0 }, #endif /* WITH_API */ -#ifdef __LIBWEBSOCKETS_FOUND /** @todo: Port to C++ */ +#ifdef LIBWEBSOCKETS_FOUND { .name = "live", .callback = websocket_protocol_cb, @@ -166,7 +166,7 @@ void Web::worker() lws_service(context, 100); while (!writables.empty()) { - wsi = writables.pull(); + wsi = writables.pop(); lws_callback_on_writable(wsi); }