From 2b0533012ada3ee02f1a68498b3e9aca8c8d7755 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 14:05:47 +0100 Subject: [PATCH] libnm: allow using _LOGx() macros in libnm (cherry picked from commit 1b0f0f8c47e58f5c14778ba77f0ca43026c73d11) --- libnm/nm-libnm-utils.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 98739db47c..8ac05d7076 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -8,6 +8,7 @@ #include "c-list/src/c-list.h" #include "nm-glib-aux/nm-ref-string.h" +#include "nm-glib-aux/nm-logging-fwd.h" #include "nm-types.h" #include "nm-object.h" #include "nm-client.h" @@ -66,6 +67,18 @@ typedef enum { | NML_DBUS_LOG_LEVEL_WARN, } NMLDBusLogLevel; +#undef _LOGL_TRACE +#undef _LOGL_DEBUG +#undef _LOGL_INFO +#undef _LOGL_WARN +#undef _LOGL_ERR + +#define _LOGL_TRACE NML_DBUS_LOG_LEVEL_TRACE +#define _LOGL_DEBUG NML_DBUS_LOG_LEVEL_DEBUG +#define _LOGL_INFO NML_DBUS_LOG_LEVEL_INFO +#define _LOGL_WARN NML_DBUS_LOG_LEVEL_WARN +#define _LOGL_ERR NML_DBUS_LOG_LEVEL_ERR + extern volatile int _nml_dbus_log_level; int _nml_dbus_log_level_init (void);