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

add compatability with jansson 2.9

Browse source
This commit is contained in:
Steffen Vogel 2019-02-09 20:11:21 +00:00
parent 995ccb86e9
commit b46eee0199
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -92,7 +92,7 @@ find_program(PROTOBUF_COMPILER NAMES protoc)
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig")
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.10)
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.9)
pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET REQUIRED libwebsockets>=2.3.0)
pkg_check_modules(PROTOBUF IMPORTED_TARGET protobuf>=2.6.0)
pkg_check_modules(PROTOBUFC IMPORTED_TARGET libprotobuf-c>=1.1.0)

1
lib/api/sessions/socket.cpp
View file

@ -22,6 +22,7 @@
#include <sstream>
#include <villas/compat.h>
#include <villas/log.hpp>
#include <villas/api/sessions/socket.hpp>

16
lib/nodes/uldaq.c
View file

@ -413,19 +413,15 @@ int uldaq_check(struct node *n)
Range ranges_se[num_ranges_se];
for (int i = 0; i < num_ranges_diff; i++) {
long long rng;
err = ulAIGetInfo(u->device_handle, AI_INFO_DIFF_RANGE, i, &rng);
ranges_diff[i] = *(Range *) rng;
err = ulAIGetInfo(u->device_handle, AI_INFO_DIFF_RANGE, i, (long long *) &ranges_diff[i]);
if (err != ERR_NO_ERROR)
return -1;
}
for (int i = 0; i < num_ranges_se; i++) {
long long rng;
err = ulAIGetInfo(u->device_handle, AI_INFO_SE_RANGE, i, &rng);
ranges_se[i] = *(Range *) rng;
err = ulAIGetInfo(u->device_handle, AI_INFO_SE_RANGE, i, (long long *) &ranges_se[i]);
if (err != ERR_NO_ERROR)
return -1;
}
if (!has_ai) {