From 73f860db9893deab6aebceb53dd7d0deb662e832 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 31 Jul 2014 04:15:29 -0400 Subject: [PATCH] Always prefer our headers to system headers In practice this shouldn't make much difference, but sometimes our headers might be newer, and we want to test them. --- src/activate/activate.c | 2 +- src/bootchart/bootchart.c | 2 +- src/core/machine-id-setup.c | 2 +- src/journal/cat.c | 2 +- src/journal/coredump.c | 4 ++-- src/journal/coredumpctl.c | 2 +- src/journal/journal-def.h | 2 +- src/journal/journal-file.h | 2 +- src/journal/journal-internal.h | 2 +- src/journal/journal-qrcode.h | 2 +- src/journal/journalctl.c | 2 +- src/journal/journald-kmsg.c | 2 +- src/journal/journald.c | 6 +++--- src/journal/test-journal-init.c | 2 +- src/journal/test-journal-interleaving.c | 2 +- src/journal/test-journal-match.c | 2 +- src/journal/test-journal-send.c | 2 +- src/journal/test-journal-stream.c | 2 +- src/journal/test-journal.c | 2 +- src/libsystemd/sd-login/test-login.c | 2 +- src/notify/notify.c | 2 +- src/python-systemd/_daemon.c | 2 +- src/python-systemd/_journal.c | 2 +- src/python-systemd/_reader.c | 2 +- src/python-systemd/id128.c | 2 +- src/readahead/readahead-collect.c | 2 +- src/readahead/readahead-replay.c | 2 +- src/shared/condition-util.c | 2 +- src/shared/logs-show.h | 2 +- src/shutdownd/shutdownd.c | 4 ++-- src/test/test-daemon.c | 2 +- src/test/test-id128.c | 2 +- src/udev/udev-builtin-uaccess.c | 2 +- 33 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/activate/activate.c b/src/activate/activate.c index 8c5827399..c3309a848 100644 --- a/src/activate/activate.c +++ b/src/activate/activate.c @@ -27,7 +27,7 @@ #include #include -#include +#include "systemd/sd-daemon.h" #include "socket-util.h" #include "build.h" diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 692cbb983..0ae72c29b 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include "systemd/sd-journal.h" #include "util.h" #include "fileio.h" diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index f15480048..712f60cb1 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -27,7 +27,7 @@ #include #include -#include +#include "systemd/sd-id128.h" #include "machine-id-setup.h" #include "macro.h" diff --git a/src/journal/cat.c b/src/journal/cat.c index 60625cb6d..a525bcf3e 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -27,7 +27,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "util.h" #include "build.h" diff --git a/src/journal/coredump.c b/src/journal/coredump.c index fee0a909d..db51098d9 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -26,8 +26,8 @@ #include #include -#include -#include +#include "systemd/sd-journal.h" +#include "systemd/sd-login.h" #include "log.h" #include "util.h" diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c index e5f4d4571..2bc902102 100644 --- a/src/journal/coredumpctl.c +++ b/src/journal/coredumpctl.c @@ -26,7 +26,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "build.h" #include "set.h" diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h index 089dd9883..e55fa196f 100644 --- a/src/journal/journal-def.h +++ b/src/journal/journal-def.h @@ -23,7 +23,7 @@ #include "sparse-endian.h" -#include +#include "systemd/sd-id128.h" #include "macro.h" diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index b0c28b5e8..6703b93b8 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -27,7 +27,7 @@ #include #endif -#include +#include "systemd/sd-id128.h" #include "sparse-endian.h" #include "journal-def.h" diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h index 2c401e308..2f1f7fc77 100644 --- a/src/journal/journal-internal.h +++ b/src/journal/journal-internal.h @@ -25,7 +25,7 @@ #include #include -#include +#include "systemd/sd-id128.h" #include "journal-def.h" #include "list.h" diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h index da6244c16..c527e6555 100644 --- a/src/journal/journal-qrcode.h +++ b/src/journal/journal-qrcode.h @@ -25,6 +25,6 @@ #include #include -#include +#include "systemd/sd-id128.h" int print_qr_code(FILE *f, const void *seed, size_t seed_size, uint64_t start, uint64_t interval, const char *hn, sd_id128_t machine); diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 78495f8c9..52fd8beb2 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -40,7 +40,7 @@ #include "acl-util.h" #endif -#include +#include "systemd/sd-journal.h" #include "log.h" #include "logs-show.h" diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index bb62a76ff..9935986c1 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -25,7 +25,7 @@ #include #include -#include +#include "systemd/sd-messages.h" #include #include "journald-server.h" diff --git a/src/journal/journald.c b/src/journal/journald.c index d6b235c12..b1a0e25d0 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include "systemd/sd-journal.h" +#include "systemd/sd-messages.h" +#include "systemd/sd-daemon.h" #include "journal-authenticate.h" #include "journald-server.h" diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c index 58f260d6c..ada2f6c3e 100644 --- a/src/journal/test-journal-init.c +++ b/src/journal/test-journal-init.c @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include +#include "systemd/sd-journal.h" #include "log.h" #include "util.h" diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 5c9604472..6c5995e0c 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -23,7 +23,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "journal-file.h" #include "journal-internal.h" diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c index 37bffc188..a3187053c 100644 --- a/src/journal/test-journal-match.c +++ b/src/journal/test-journal-match.c @@ -21,7 +21,7 @@ #include -#include +#include "systemd/sd-journal.h" #include "journal-internal.h" #include "util.h" diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c index 45eb32760..81ca47ed8 100644 --- a/src/journal/test-journal-send.c +++ b/src/journal/test-journal-send.c @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include +#include "systemd/sd-journal.h" #include #include diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c index 8e1d08d59..8ccd81344 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -22,7 +22,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "journal-file.h" #include "journal-internal.h" diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index 85b4cf71a..6025d04ba 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -22,7 +22,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "log.h" #include "journal-file.h" diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c index ccf2c9581..28f88a157 100644 --- a/src/libsystemd/sd-login/test-login.c +++ b/src/libsystemd/sd-login/test-login.c @@ -22,7 +22,7 @@ #include #include -#include +#include "systemd/sd-login.h" #include "util.h" #include "strv.h" diff --git a/src/notify/notify.c b/src/notify/notify.c index 0b7f3b12f..f463c4dd8 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -27,7 +27,7 @@ #include #include -#include +#include "systemd/sd-daemon.h" #include "strv.h" #include "util.h" diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c index 7756a7880..65cfec7ce 100644 --- a/src/python-systemd/_daemon.c +++ b/src/python-systemd/_daemon.c @@ -29,7 +29,7 @@ #include #include -#include +#include "systemd/sd-daemon.h" #include "pyutil.h" #include "macro.h" diff --git a/src/python-systemd/_journal.c b/src/python-systemd/_journal.c index cbc661d83..456e4a279 100644 --- a/src/python-systemd/_journal.c +++ b/src/python-systemd/_journal.c @@ -25,7 +25,7 @@ #include "util.h" #define SD_JOURNAL_SUPPRESS_LOCATION -#include +#include "systemd/sd-journal.h" PyDoc_STRVAR(journal_sendv__doc__, "sendv('FIELD=value', 'FIELD=value', ...) -> None\n\n" diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c index 9a19a1021..d17aa83ec 100644 --- a/src/python-systemd/_reader.c +++ b/src/python-systemd/_reader.c @@ -25,7 +25,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "pyutil.h" #include "macro.h" diff --git a/src/python-systemd/id128.c b/src/python-systemd/id128.c index 6dadf7b2f..5ec7309a5 100644 --- a/src/python-systemd/id128.c +++ b/src/python-systemd/id128.c @@ -21,7 +21,7 @@ #include -#include +#include "systemd/sd-messages.h" #include "pyutil.h" #include "log.h" diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c index c1afd0d60..1592cc867 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -52,7 +52,7 @@ #include #endif -#include +#include "systemd/sd-daemon.h" #include "missing.h" #include "util.h" diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c index f46dc3bae..f81e0fe55 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -35,7 +35,7 @@ #include #include -#include +#include "systemd/sd-daemon.h" #include "missing.h" #include "util.h" diff --git a/src/shared/condition-util.c b/src/shared/condition-util.c index b52dcc52f..ff4a8ecd1 100644 --- a/src/shared/condition-util.c +++ b/src/shared/condition-util.c @@ -26,7 +26,7 @@ #include #include -#include +#include "systemd/sd-id128.h" #include "util.h" #include "condition-util.h" #include "virt.h" diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h index 3a99160f1..187ee595f 100644 --- a/src/shared/logs-show.h +++ b/src/shared/logs-show.h @@ -25,7 +25,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "util.h" #include "output-mode.h" diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c index 25427d641..92907497e 100644 --- a/src/shutdownd/shutdownd.c +++ b/src/shutdownd/shutdownd.c @@ -30,8 +30,8 @@ #include #include -#include -#include +#include "systemd/sd-daemon.h" +#include "systemd/sd-shutdown.h" #include "log.h" #include "macro.h" diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 3215f0c56..bcc049b32 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.c @@ -21,7 +21,7 @@ #include -#include +#include "systemd/sd-daemon.h" int main(int argc, char*argv[]) { diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 7b9275817..a6a0cd77a 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -21,7 +21,7 @@ #include -#include +#include "systemd/sd-id128.h" #include "util.h" #include "macro.h" diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index e2b276eb4..6964fb552 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -29,7 +29,7 @@ #include #include -#include +#include "systemd/sd-login.h" #include "logind-acl.h" #include "udev.h" #include "util.h" -- 2.30.2