Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

do not include libwebsockets.h in header files as it breaks compliation together with complex.h

Browse source
This commit is contained in:
Steffen Vogel 2018-08-02 10:28:08 +02:00
parent 96bcbd400a
commit 9a7f2afd0d
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/villas/api.h
View file

@ -23,7 +23,6 @@
#pragma once
#include <libwebsockets.h>
#include <jansson.h>
#include <pthread.h>
@ -39,6 +38,7 @@ extern "C"{
/* Forward declarations */
struct lws;
enum lws_callback_reasons;
struct super_node;
struct api;
@ -58,7 +58,7 @@ struct api {
struct list sessions; /**< List of currently active connections */
struct queue_signalled pending; /**< A queue of api_sessions which have pending requests. */
pthread_t thread;
struct super_node *super_node;
@ -88,4 +88,4 @@ int api_http_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void
#ifdef __cplusplus
}
#endif
#endif

2
include/villas/nodes/websocket.h
View file

@ -29,8 +29,6 @@
#pragma once
#include <libwebsockets.h>
#include <villas/node.h>
#include <villas/pool.h>
#include <villas/queue_signalled.h>

2
lib/api/session.c
View file

@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <libwebsockets.h>
#include <villas/api/session.h>
#include <villas/web.h>
#include <villas/plugin.h>

2
lib/nodes/websocket.c
View file

@ -26,6 +26,8 @@
#include <string.h>
#include <signal.h>
#include <libwebsockets.h>
#include <villas/super_node.h>
#include <villas/timing.h>
#include <villas/utils.h>