bus: catch up with latest kdbus changes

[elogind.git] / src / libsystemd-bus / bus-kernel.h

diff --git a/src/libsystemd-bus/bus-kernel.h b/src/libsystemd-bus/bus-kernel.h
index a9dddc23d903e47574669bb32b4e3e4d9c1de822..1771020903dfa5c3b90d16193213a4601c474e67 100644 (file)
--- a/src/libsystemd-bus/bus-kernel.h
+++ b/src/libsystemd-bus/bus-kernel.h
@@ -23,16 +23,16 @@
 
 #include "sd-bus.h"
 
-#define KDBUS_PART_NEXT(item) \
+#define KDBUS_ITEM_NEXT(item) \
         (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
 
-#define KDBUS_PART_FOREACH(part, head, first)                           \
+#define KDBUS_ITEM_FOREACH(part, head, first)                           \
         for (part = (head)->first;                                      \
              (uint8_t *)(part) < (uint8_t *)(head) + (head)->size;      \
-             part = KDBUS_PART_NEXT(part))
+             part = KDBUS_ITEM_NEXT(part))
 
-#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data)
-#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_PART_HEADER_SIZE)
+#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
+#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE)
 
 #define MEMFD_CACHE_MAX 32