diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-07-21 12:57:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-07-23 16:43:36 +0200 |
| commit | 32b2d150217515201b5a5576aceb3f10ea03c33f (patch) | |
| tree | 1bbf7e2c6afe91d69647c802d4756a6a51040667 | |
| parent | 391d714b19d7108cc7bece12f0e0ab3c6f143c3a (diff) | |
| download | NetworkManager-32b2d150217515201b5a5576aceb3f10ea03c33f.tar.gz | |
cloud-setup: link with libnm-log-null
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/libnm-glib-aux/nm-logging-base.c | 2 | ||||
| -rw-r--r-- | src/nm-cloud-setup/nm-cloud-setup-utils.c | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 0e72432039..ed08230973 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5172,6 +5172,7 @@ src_nm_cloud_setup_nm_cloud_setup_LDADD = \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-log-null/libnm-log-null.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ src/libnm-client-impl/libnm.la \ @@ -5236,6 +5237,7 @@ src_nm_cloud_setup_tests_test_cloud_setup_general_LDADD = \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-log-null/libnm-log-null.la \ src/libnm-std-aux/libnm-std-aux.la \ src/c-siphash/libc-siphash.la \ src/libnm-client-impl/libnm.la \ diff --git a/src/libnm-glib-aux/nm-logging-base.c b/src/libnm-glib-aux/nm-logging-base.c index b07c62f4a2..b3a2ffd614 100644 --- a/src/libnm-glib-aux/nm-logging-base.c +++ b/src/libnm-glib-aux/nm-logging-base.c @@ -80,6 +80,8 @@ _nm_log_parse_level(const char *level, NMLogLevel *out_level) return FALSE; } +/*****************************************************************************/ + void _nm_log_simple_printf(NMLogLevel level, const char *fmt, ...) { diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.c b/src/nm-cloud-setup/nm-cloud-setup-utils.c index 9157ce8855..50720ba26f 100644 --- a/src/nm-cloud-setup/nm-cloud-setup-utils.c +++ b/src/nm-cloud-setup/nm-cloud-setup-utils.c @@ -28,12 +28,6 @@ _nm_logging_enabled_init(const char *level_str) _nm_logging_configured_level = level; } -void -_nm_utils_monotonic_timestamp_initialized(const struct timespec *tp, - gint64 offset_sec, - gboolean is_boottime) -{} - /*****************************************************************************/ G_LOCK_DEFINE_STATIC(_wait_for_objects_lock); |