diff --git a/cmk.sh b/cmk.sh index 2d2d72f18..8e00f07e9 100755 --- a/cmk.sh +++ b/cmk.sh @@ -178,7 +178,7 @@ echo "in "$PWD #cmake if [ $REBUILD -eq 1 ]; then rm -f CMakeCache.txt - BUILDCOMMAND="$CMAKE_PRE cmake $CMAKE_POST .." + BUILDCOMMAND="$CMAKE_PRE cmake3 $CMAKE_POST .." echo $BUILDCOMMAND eval $BUILDCOMMAND fi diff --git a/slsSupportLib/include/ZmqSocket.h b/slsSupportLib/include/ZmqSocket.h index 3cf490533..c9cfc735e 100644 --- a/slsSupportLib/include/ZmqSocket.h +++ b/slsSupportLib/include/ZmqSocket.h @@ -262,19 +262,19 @@ public: "{" "\"jsonversion\":%u, " "\"bitmode\":%u, " - "\"fileIndex\":%llu, " + "\"fileIndex\":%lu, " "\"shape\":[%u, %u], " "\"size\":%u, " - "\"acqIndex\":%llu, " - "\"fIndex\":%llu, " + "\"acqIndex\":%lu, " + "\"fIndex\":%lu, " "\"fname\":\"%s\", " "\"data\": %d, " - "\"frameNumber\":%llu, " + "\"frameNumber\":%lu, " "\"expLength\":%u, " "\"packetNumber\":%u, " - "\"bunchId\":%llu, " - "\"timestamp\":%llu, " + "\"bunchId\":%lu, " + "\"timestamp\":%lu, " "\"modId\":%u, " "\"row\":%u, " "\"column\":%u, "