diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bf0bb0c7..7b52e8853 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/lib/api/sessions/socket.cpp b/lib/api/sessions/socket.cpp index eeccdb325..dcefe7be7 100644 --- a/lib/api/sessions/socket.cpp +++ b/lib/api/sessions/socket.cpp @@ -22,6 +22,7 @@ #include +#include #include #include diff --git a/lib/nodes/uldaq.c b/lib/nodes/uldaq.c index 238c5de21..2bc38301b 100644 --- a/lib/nodes/uldaq.c +++ b/lib/nodes/uldaq.c @@ -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) {