Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

event lib: glib: LWS_WITH_GLIB option fixes

Browse source
This commit is contained in:
sergey radionov 2020-02-08 18:53:08 +07:00 • committed by Andy Green
parent af2f1f9a87
commit c966aae30a
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/core-net/pollfd.c
View file

@ -1,7 +1,7 @@
/*
* libwebsockets - small server side websockets and web server implementation
*
* Copyright (C) 2010 - 2019 Andy Green <andy@warmcat.com>
* Copyright (C) 2010 - 2020 Andy Green <andy@warmcat.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -27,7 +27,8 @@
int
_lws_change_pollfd(struct lws *wsi, int _and, int _or, struct lws_pollargs *pa)
{
#if !defined(LWS_WITH_LIBUV) && !defined(LWS_WITH_LIBEV) && !defined(LWS_WITH_LIBEVENT)
#if !defined(LWS_WITH_LIBUV) && !defined(LWS_WITH_LIBEV) && \
!defined(LWS_WITH_LIBEVENT) && !defined(LWS_WITH_GLIB)
volatile struct lws_context_per_thread *vpt;
#endif
struct lws_context_per_thread *pt;
@ -71,10 +72,8 @@ _lws_change_pollfd(struct lws *wsi, int _and, int _or, struct lws_pollargs *pa)
assert(wsi->position_in_fds_table < (int)pt->fds_count);
#if !defined(LWS_WITH_LIBUV) && \
!defined(LWS_WITH_LIBEV) && \
!defined(LWS_WITH_LIBEVENT) && \
!defined(LWS_WITH_GLIB)
#if !defined(LWS_WITH_LIBUV) && !defined(LWS_WITH_LIBEV) && \
!defined(LWS_WITH_LIBEVENT) && !defined(LWS_WITH_GLIB)
/*
* This only applies when we use the default poll() event loop.
*

2
lib/core-net/private-lib-core-net.h
View file

@ -434,7 +434,7 @@ struct lws_context_per_thread {
#endif
#if defined(LWS_WITH_LIBEV) || defined(LWS_WITH_LIBUV) || \
defined(LWS_WITH_LIBEVENT)
defined(LWS_WITH_LIBEVENT) || defined(LWS_WITH_GLIB)
struct lws_signal_watcher w_sigint;
#endif

2
minimal-examples/http-server/minimal-http-server-eventlib-foreign/minimal-http-server-eventlib-foreign.c
View file

@ -482,7 +482,7 @@ int main(int argc, const char **argv)
if (info.options & LWS_SERVER_OPTION_LIBEV)
foreign_event_loop_cleanup_libev();
#endif
#if defined(LWS_WITH_LIBEV)
#if defined(LWS_WITH_GLIB)
if (info.options & LWS_SERVER_OPTION_GLIB)
foreign_event_loop_cleanup_glib();
#endif