From 22d097a6bbeac0d45c42e1b246403a97e9a16c30 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 28 Nov 2014 21:12:03 +0100
Subject: [PATCH] sd-bus: move packet header definition to bus-protocol.h

---
 src/libsystemd/sd-bus/bus-message.h  | 14 --------------
 src/libsystemd/sd-bus/bus-protocol.h | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index e54543a04..571d42255 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -52,20 +52,6 @@ struct bus_container {
         char *peeked_signature;
 };
 
-struct bus_header {
-        uint8_t endian;
-        uint8_t type;
-        uint8_t flags;
-        uint8_t version;
-        uint32_t body_size;
-
-        /* Note that what the bus spec calls "serial" we'll call
-        "cookie" instead, because we don't want to imply that the
-        cookie was in any way monotonically increasing. */
-        uint32_t serial;
-        uint32_t fields_size;
-} _packed_;
-
 struct bus_body_part {
         struct bus_body_part *next;
         void *data;
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
index 75c6ded72..6431dfbff 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libsystemd/sd-bus/bus-protocol.h
@@ -23,6 +23,22 @@
 
 #include <endian.h>
 
+/* Packet header */
+
+struct bus_header {
+        uint8_t endian;
+        uint8_t type;
+        uint8_t flags;
+        uint8_t version;
+        uint32_t body_size;
+
+        /* Note that what the bus spec calls "serial" we'll call
+        "cookie" instead, because we don't want to imply that the
+        cookie was in any way monotonically increasing. */
+        uint32_t serial;
+        uint32_t fields_size;
+} _packed_;
+
 /* Endianness */
 
 enum {
-- 
2.30.2