diff options
author | Thomas Haller <thaller@redhat.com> | 2018-10-12 17:07:25 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-10-18 12:16:55 +0200 |
commit | 636516e7080a28a796e9e585f15eb57a6ecbe7c8 (patch) | |
tree | a221c2af464b6c5ba62ba787e86d9f6422cdff70 | |
parent | dfdbd1b385aa48a4c128283ae2b3234885808f5a (diff) | |
download | NetworkManager-636516e7080a28a796e9e585f15eb57a6ecbe7c8.tar.gz |
logging: make nm-logging.c independent of other core components
"nm-logging.c" now no longer depends on anything particularly special
from NM core.
-rw-r--r-- | shared/nm-default.h | 1 | ||||
-rw-r--r-- | src/nm-logging.c | 4 | ||||
-rw-r--r-- | src/nm-logging.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/shared/nm-default.h b/shared/nm-default.h index 207acd202f..35c6009ff9 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -303,6 +303,7 @@ _nm_g_return_if_fail_warning (const char *log_domain, /*****************************************************************************/ #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON +#include "nm-core-types.h" #include "nm-types.h" #include "nm-logging.h" #endif diff --git a/src/nm-logging.c b/src/nm-logging.c index e8bb7025cc..328d164ba2 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -21,6 +21,8 @@ #include "nm-default.h" +#include "nm-logging.h" + #include <dlfcn.h> #include <syslog.h> #include <stdio.h> @@ -37,8 +39,8 @@ #include <systemd/sd-journal.h> #endif +#include "nm-utils/nm-time-utils.h" #include "nm-errors.h" -#include "nm-core-utils.h" /* often we have some static string where we need to know the maximum length. * _MAX_LEN() returns @max but adds a debugging assertion that @str is indeed diff --git a/src/nm-logging.h b/src/nm-logging.h index 0737bbd639..451d51c5e0 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -22,8 +22,6 @@ #ifndef __NETWORKMANAGER_LOGGING_H__ #define __NETWORKMANAGER_LOGGING_H__ -#include "nm-core-types.h" - #ifdef __NM_TEST_UTILS_H__ #error nm-test-utils.h must be included as last header #endif |