diff options
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/mm-log.h | 12 |
2 files changed, 10 insertions, 5 deletions
@@ -26,8 +26,9 @@ #include "ModemManager.h" -#include "mm-base-manager.h" +#define MM_LOG_NO_OBJECT #include "mm-log.h" +#include "mm-base-manager.h" #include "mm-context.h" #if defined WITH_SYSTEMD_SUSPEND_RESUME diff --git a/src/mm-log.h b/src/mm-log.h index d33cef9f..d0b5c607 100644 --- a/src/mm-log.h +++ b/src/mm-log.h @@ -36,10 +36,14 @@ typedef enum { #define mm_obj_info(obj, ...) _mm_log (obj, MM_MODULE_NAME, G_STRLOC, G_STRFUNC, MM_LOG_LEVEL_INFO, ## __VA_ARGS__ ) #define mm_obj_dbg(obj, ...) _mm_log (obj, MM_MODULE_NAME, G_STRLOC, G_STRFUNC, MM_LOG_LEVEL_DEBUG, ## __VA_ARGS__ ) -#define mm_err(...) mm_obj_err (NULL, ## __VA_ARGS__ ) -#define mm_warn(...) mm_obj_warn (NULL, ## __VA_ARGS__ ) -#define mm_info(...) mm_obj_info (NULL, ## __VA_ARGS__ ) -#define mm_dbg(...) mm_obj_dbg (NULL, ## __VA_ARGS__ ) +/* only allow using non-object logging API if explicitly requested + * (e.g. in the main daemon source) */ +#if defined MM_LOG_NO_OBJECT +# define mm_err(...) mm_obj_err (NULL, ## __VA_ARGS__ ) +# define mm_warn(...) mm_obj_warn (NULL, ## __VA_ARGS__ ) +# define mm_info(...) mm_obj_info (NULL, ## __VA_ARGS__ ) +# define mm_dbg(...) mm_obj_dbg (NULL, ## __VA_ARGS__ ) +#endif void _mm_log (gpointer obj, const gchar *module, |