From: Simon Marchi Date: Tue, 14 Jun 2022 20:59:21 +0000 (-0400) Subject: ctf: rename identifiers ERROR and DEBUG_PROCESS X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=0c0001b4217c12afc799dea7534af0d05ca6e440 ctf: rename identifiers ERROR and DEBUG_PROCESS When trying to use src/cpp-common/bt2/trace-ir.hpp, the build fails on Windows (MinGW64) with: CXX viewer-connection.o In file included from /usr/x86_64-w64-mingw32/include/windows.h:71, from /usr/x86_64-w64-mingw32/include/winsock2.h:23, from /home/smarchi/src/babeltrace/src/compat/socket.h:15, from /home/smarchi/src/babeltrace/src/plugins/ctf/lttng-live/viewer-connection.cpp:23: /home/smarchi/src/babeltrace/src/cpp-common/bt2/trace-ir.hpp:1081:9: error: expected identifier before numeric constant 1081 | ERROR = BT_EVENT_CLASS_LOG_LEVEL_ERROR, | ^~~~~ This is because there is an "ERROR" macro defined in wingdi.h: https://github.com/mirror/mingw-w64/blob/7da5597116c5335e9a0f1154d171750bd2531baf/mingw-w64-headers/include/wingdi.h#L75 Same thing with DEBUG_PROCESS. Rename to ERROR to ERR and DEBUG_PROCESS to DEBUG_PROC. Change-Id: I31ed7578e84ce1bee883f0d9f121c1ea47e8a679 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8368 Reviewed-by: Philippe Proulx --- diff --git a/src/cpp-common/bt2/trace-ir.hpp b/src/cpp-common/bt2/trace-ir.hpp index 3c8637cf..62dc04e6 100644 --- a/src/cpp-common/bt2/trace-ir.hpp +++ b/src/cpp-common/bt2/trace-ir.hpp @@ -999,13 +999,13 @@ public: EMERGENCY = BT_EVENT_CLASS_LOG_LEVEL_EMERGENCY, ALERT = BT_EVENT_CLASS_LOG_LEVEL_ALERT, CRITICAL = BT_EVENT_CLASS_LOG_LEVEL_CRITICAL, - ERROR = BT_EVENT_CLASS_LOG_LEVEL_ERROR, + ERR = BT_EVENT_CLASS_LOG_LEVEL_ERROR, WARNING = BT_EVENT_CLASS_LOG_LEVEL_WARNING, NOTICE = BT_EVENT_CLASS_LOG_LEVEL_NOTICE, INFO = BT_EVENT_CLASS_LOG_LEVEL_INFO, DEBUG_SYSTEM = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_SYSTEM, DEBUG_PROGRAM = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROGRAM, - DEBUG_PROCESS = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROCESS, + DEBUG_PROC = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROCESS, DEBUG_MODULE = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_MODULE, DEBUG_UNIT = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_UNIT, DEBUG_FUNCTION = BT_EVENT_CLASS_LOG_LEVEL_DEBUG_FUNCTION,