From 57f986c13ef90017b9d42bf2b370e342053e12ee Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 20 May 2017 17:31:05 -0400 Subject: Fix it using /usr/include/systemd instead of src/libsystemd/include/systemd To avoid a cyclic dependency thing, `sd-id128.h` has been split in to `sd-id128{,-static}.h`. --- src/libsystemd-basic/include/systemd-basic/_sd-common.h | 1 + src/libsystemd-basic/include/systemd-basic/btrfs-util.h | 3 +-- src/libsystemd-basic/include/systemd-basic/log.h | 3 +-- src/libsystemd-basic/include/systemd-basic/sd-id128-static.h | 1 + src/libsystemd-basic/include/systemd-basic/sd-messages.h | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) create mode 120000 src/libsystemd-basic/include/systemd-basic/_sd-common.h create mode 120000 src/libsystemd-basic/include/systemd-basic/sd-id128-static.h create mode 120000 src/libsystemd-basic/include/systemd-basic/sd-messages.h (limited to 'src/libsystemd-basic/include') diff --git a/src/libsystemd-basic/include/systemd-basic/_sd-common.h b/src/libsystemd-basic/include/systemd-basic/_sd-common.h new file mode 120000 index 0000000000..653327c267 --- /dev/null +++ b/src/libsystemd-basic/include/systemd-basic/_sd-common.h @@ -0,0 +1 @@ +../../../libsystemd/include/systemd/_sd-common.h \ No newline at end of file diff --git a/src/libsystemd-basic/include/systemd-basic/btrfs-util.h b/src/libsystemd-basic/include/systemd-basic/btrfs-util.h index db431f5b74..4d7fcd4e62 100644 --- a/src/libsystemd-basic/include/systemd-basic/btrfs-util.h +++ b/src/libsystemd-basic/include/systemd-basic/btrfs-util.h @@ -23,8 +23,7 @@ #include #include -#include - +#include "sd-id128-static.h" #include "time-util.h" typedef struct BtrfsSubvolInfo { diff --git a/src/libsystemd-basic/include/systemd-basic/log.h b/src/libsystemd-basic/include/systemd-basic/log.h index f5f62e1c23..3e6c9197b0 100644 --- a/src/libsystemd-basic/include/systemd-basic/log.h +++ b/src/libsystemd-basic/include/systemd-basic/log.h @@ -27,9 +27,8 @@ #include #include -#include - #include "macro.h" +#include "sd-id128-static.h" typedef enum LogTarget{ LOG_TARGET_CONSOLE, diff --git a/src/libsystemd-basic/include/systemd-basic/sd-id128-static.h b/src/libsystemd-basic/include/systemd-basic/sd-id128-static.h new file mode 120000 index 0000000000..7cbc65a7c2 --- /dev/null +++ b/src/libsystemd-basic/include/systemd-basic/sd-id128-static.h @@ -0,0 +1 @@ +../../../libsystemd/include/systemd/sd-id128-static.h \ No newline at end of file diff --git a/src/libsystemd-basic/include/systemd-basic/sd-messages.h b/src/libsystemd-basic/include/systemd-basic/sd-messages.h new file mode 120000 index 0000000000..a1ffa23ad0 --- /dev/null +++ b/src/libsystemd-basic/include/systemd-basic/sd-messages.h @@ -0,0 +1 @@ +../../../libsystemd/include/systemd/sd-messages.h \ No newline at end of file -- cgit v1.2.3-54-g00ecf