From 42fa8f3d2722dd9fa987b95919f8dd42d23f0367 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Nov 2020 16:19:42 +0100 Subject: [PATCH] shared: don't enforce unset G_LOG_DOMAIN in "nm-default.h" When including , it will always define G_LOG_DOMAIN if it is not yet defined. Usually we want to include "nm-default.h" as very first header. In that case, is not yet included. Then the previous check #error works well. However, if we include "nm-default.h" in sources generated by glib-mkenums, then the generator first already includes , and thus defines G_LOG_DOMAIN. It does so for "libnm-core/nm-core-enum-types.c" and "libnm/nm-enum-types.c", where the #error would not trigger. But we will also include "nm-default.h" for "libnm-core/tests/nm-core-tests-enum-types.c". That will start triggering this #error. While in general we want to include "nm-default.h" first, we also need to support cases where gets included first. Thus this error is not useful. Remove it. --- shared/nm-default.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/shared/nm-default.h b/shared/nm-default.h index 6338c8b8a..b322f1d37 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -73,9 +73,6 @@ #else #error Need to define G_LOG_DOMAIN #endif -#elif defined(NETWORKMANAGER_COMPILATION_TEST) \ - || (NETWORKMANAGER_COMPILATION & NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON) - #error Do not define G_LOG_DOMAIN with NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON #endif /*****************************************************************************/