util: replace close_nointr_nofail() by a more useful safe_close()

[elogind.git] / src / libsystemd / sd-bus / bus-message.h

diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index 5322375ef1c576eb596e13bf7d009b85fa6143d5..df792945b0206f605be6eed546021005f37d895e 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -84,7 +84,7 @@ struct sd_bus_message {
 
         sd_bus *bus;
 
-        uint32_t reply_cookie;
+        uint64_t reply_cookie;
 
         const char *path;
         const char *interface;
@@ -98,6 +98,8 @@ struct sd_bus_message {
 
         usec_t monotonic;
         usec_t realtime;
+        uint64_t seqnum;
+        int64_t priority;
 
         bool sealed:1;
         bool dont_send:1;
@@ -160,7 +162,8 @@ static inline uint64_t BUS_MESSAGE_BSWAP64(sd_bus_message *m, uint64_t u) {
         return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_64(u) : u;
 }
 
-static inline uint32_t BUS_MESSAGE_COOKIE(sd_bus_message *m) {
+static inline uint64_t BUS_MESSAGE_COOKIE(sd_bus_message *m) {
+        /* Note that we return the serial converted to a 64bit value here */
         return BUS_MESSAGE_BSWAP32(m, m->header->serial);
 }