From 6a4b0d8df52f5cbac7ee31c4bf5acdc650bbdbbf Mon Sep 17 00:00:00 2001 From: Leonardo Carreras Date: Wed, 5 Feb 2025 00:26:09 +0000 Subject: [PATCH] Apply PR suggestions about style and import criteria Signed-off-by: Leonardo Carreras --- common/include/villas/tsc.hpp | 4 ++-- packaging/docker/Dockerfile.ubuntu | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/include/villas/tsc.hpp b/common/include/villas/tsc.hpp index ce8496d04..430ce0a54 100644 --- a/common/include/villas/tsc.hpp +++ b/common/include/villas/tsc.hpp @@ -32,7 +32,7 @@ #endif #ifndef CLOCK_MONOTONIC_RAW -#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC // Fallback for macOS/BSD +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC // Fallback for Darwin/BSD #endif #endif @@ -51,7 +51,7 @@ __attribute__((unused)) static uint64_t tsc_now(struct Tsc *t) { return t->rdtscp_supported ? __rdtscp(&tsc_aux) : __rdtsc(); } #else -// Fallback for CLOCK_MONOTONIC_RAW (linux/BSD/mac specific) +// Fallback for CLOCK_MONOTONIC_RAW (Linux/Darwin/BSD specific) __attribute__((unused)) static uint64_t tsc_now(struct Tsc *t) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC_RAW, &ts); diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 22dbd2b8e..feb4ae2b4 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -58,7 +58,7 @@ RUN apt-get update && \ libnice-dev \ libmodbus-dev \ libre2-dev \ - libglib2.0-0 libglib2.0-dev \ + libglib2.0-dev \ libcriterion-dev # Add local and 64-bit locations to linker paths