diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-02 17:54:39 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-02 17:54:39 -0400 |
| commit | 01a67dbfc491832def1ba8a2c3e7cda228e6f7c2 (patch) | |
| tree | e5a25487d4ec161ed7e83754710ba8f83ec355f1 /src/grp-journal | |
| parent | d7efceae3181337f25c8ef992923ae172b28b277 (diff) | |
./fixup.sh
Diffstat (limited to 'src/grp-journal')
| -rw-r--r-- | src/grp-journal/journalctl/journalctl.c | 3 | ||||
| -rw-r--r-- | src/grp-journal/libjournal-core/journald-server.h | 7 | ||||
| -rw-r--r-- | src/grp-journal/libjournal-core/journald-stream.h | 4 | ||||
| -rw-r--r-- | src/grp-journal/libjournal-core/test-audit-type.c | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/grp-journal/journalctl/journalctl.c b/src/grp-journal/journalctl/journalctl.c index 85a934e978..8901b46ae5 100644 --- a/src/grp-journal/journalctl/journalctl.c +++ b/src/grp-journal/journalctl/journalctl.c @@ -21,7 +21,6 @@ #include <fcntl.h> #include <fnmatch.h> #include <getopt.h> -#include <linux/fs.h> #include <locale.h> #include <poll.h> #include <signal.h> @@ -33,6 +32,8 @@ #include <sys/stat.h> #include <unistd.h> +#include <linux/fs.h> + #include <systemd/sd-bus.h> #include <systemd/sd-journal.h> diff --git a/src/grp-journal/libjournal-core/journald-server.h b/src/grp-journal/libjournal-core/journald-server.h index 897ee09ca2..5f1af1e50b 100644 --- a/src/grp-journal/libjournal-core/journald-server.h +++ b/src/grp-journal/libjournal-core/journald-server.h @@ -24,13 +24,14 @@ #include <systemd/sd-event.h> -typedef struct Server Server; - #include "basic/hashmap.h" +#include "basic/list.h" #include "sd-journal/journal-file.h" + +typedef struct Server Server; + #include "journald-rate-limit.h" #include "journald-stream.h" -#include "basic/list.h" typedef enum Storage { STORAGE_AUTO, diff --git a/src/grp-journal/libjournal-core/journald-stream.h b/src/grp-journal/libjournal-core/journald-stream.h index 29f43b459f..c971d0a00d 100644 --- a/src/grp-journal/libjournal-core/journald-stream.h +++ b/src/grp-journal/libjournal-core/journald-stream.h @@ -19,10 +19,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -typedef struct StdoutStream StdoutStream; - #include "basic/fdset.h" +typedef struct StdoutStream StdoutStream; + #include "journald-server.h" int server_open_stdout_socket(Server *s); diff --git a/src/grp-journal/libjournal-core/test-audit-type.c b/src/grp-journal/libjournal-core/test-audit-type.c index 38917b30a5..812a3953ea 100644 --- a/src/grp-journal/libjournal-core/test-audit-type.c +++ b/src/grp-journal/libjournal-core/test-audit-type.c @@ -17,9 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <linux/audit.h> #include <stdio.h> +#include <linux/audit.h> + #include "sd-journal/audit-type.h" static void print_audit_label(int i) { |