X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.h;h=d08a194780a1704df739545dae57cee6282fd248;hb=cee5e9a7ca75f05d4a0f7759566e657587a500d5;hp=3537a494205eb652ab9b9c71596ebe06dd0ed96b;hpb=205c4d1d6a3f5343f970abf20283d69dcec359ed;p=elogind.git

diff --git a/src/journal/journald.h b/src/journal/journald.h
index 3537a4942..d08a19478 100644
--- a/src/journal/journald.h
+++ b/src/journal/journald.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foojournaldhfoo
-#define foojournaldhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -50,7 +49,7 @@ typedef struct Server {
         int syslog_fd;
         int native_fd;
         int stdout_fd;
-        int proc_kmsg_fd;
+        int dev_kmsg_fd;
 
         JournalFile *runtime_journal;
         JournalFile *system_journal;
@@ -74,10 +73,6 @@ typedef struct Server {
         bool forward_to_syslog;
         bool forward_to_console;
 
-        bool import_proc_kmsg;
-        char proc_kmsg_buffer[LINE_MAX+1];
-        size_t proc_kmsg_length;
-
         uint64_t cached_available_space;
         usec_t cached_available_space_timestamp;
 
@@ -97,6 +92,10 @@ typedef struct Server {
         int max_level_console;
 
         Storage storage;
+
+        bool dev_kmsg_readable;
+
+        uint64_t *kernel_seqnum;
 } Server;
 
 /* gperf lookup function */
@@ -106,5 +105,3 @@ int config_parse_storage(const char *filename, unsigned line, const char *sectio
 
 const char *storage_to_string(Storage s);
 Storage storage_from_string(const char *s);
-
-#endif