From e78f4f689d012d2e5d92731ba567f8db313df410 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Feb 2026 11:11:01 +1000 Subject: [PATCH] util: add guards for the etrace/trace defines This file is really useful on its own for other projects if auto-included via export CFLAGS="$CFLAGS -include /path/to/file.h" However, that causes compiler warnings, let's add indef checks for this as a quick workaround. Since these three come as a set and are only used for debugging, we can ifndef them all in one go rather than individually. Part-of: --- src/libinput-util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libinput-util.h b/src/libinput-util.h index a0e9529e..d868cde2 100644 --- a/src/libinput-util.h +++ b/src/libinput-util.h @@ -60,15 +60,16 @@ #define DEFAULT_MOUSE_DPI 1000 #define DEFAULT_TRACKPOINT_SENSITIVITY 128 +#if !defined(_trace) && !defined(trace) && !defined(etrace) #define _trace(file, ...) \ do { \ char buf_[1024]; \ snprintf(buf_, sizeof(buf_), __VA_ARGS__); \ fprintf(file, ANSI_BLUE "%30s():%4d - " ANSI_RED "%s" ANSI_NORMAL "\n", __func__, __LINE__, buf_); \ } while (0) - #define trace(...) _trace(stdout, __VA_ARGS__) #define etrace(...) _trace(stderr, __VA_ARGS__) +#endif #define LIBINPUT_EXPORT __attribute__ ((visibility("default")))