diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-10-04 16:10:07 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-10-04 16:10:14 +0200 |
| commit | 46b36083ce94d5e7470589fc2927a227d609a436 (patch) | |
| tree | 49904682bb84f1da8d6e088a4f45e3669b4420db | |
| parent | 6ef929d19fb7622b4430ecb2434b1562221c65ae (diff) | |
| download | NetworkManager-46b36083ce94d5e7470589fc2927a227d609a436.tar.gz | |
systemd: drop invalid "user-util.h" compat header
We included the original "user-util.h" header. There must
be no compat header.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/libnm-systemd-shared/sd-adapt-shared/user-util.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 13cadec6dc..aade176f52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2233,7 +2233,6 @@ src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ src/libnm-systemd-shared/sd-adapt-shared/sysctl-util.h \ src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h \ src/libnm-systemd-shared/sd-adapt-shared/unaligned.h \ - src/libnm-systemd-shared/sd-adapt-shared/user-util.h \ src/libnm-systemd-shared/sd-adapt-shared/virt.h \ src/libnm-systemd-shared/src/basic/alloc-util.c \ src/libnm-systemd-shared/src/basic/alloc-util.h \ @@ -2328,6 +2327,7 @@ src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \ src/libnm-systemd-shared/src/basic/tmpfile-util.c \ src/libnm-systemd-shared/src/basic/tmpfile-util.h \ src/libnm-systemd-shared/src/basic/umask-util.h \ + src/libnm-systemd-shared/src/basic/user-util.h \ src/libnm-systemd-shared/src/basic/utf8.c \ src/libnm-systemd-shared/src/basic/utf8.h \ src/libnm-systemd-shared/src/basic/util.c \ diff --git a/src/libnm-systemd-shared/sd-adapt-shared/user-util.h b/src/libnm-systemd-shared/sd-adapt-shared/user-util.h deleted file mode 100644 index 637892c2d6..0000000000 --- a/src/libnm-systemd-shared/sd-adapt-shared/user-util.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -/* dummy header */ |