bus: don't rely on gccisms/c11 in public header files.

[elogind.git] / src / systemd / sd-bus-vtable.h

diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index 5203bf1a9b362d90f9d0461dd57d070ee3634c26..82e50d24c83f7f93951eda52fd3172c5b6176e2c 100644 (file)
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -70,53 +70,53 @@ struct sd_bus_vtable {
                         sd_bus_property_set_t set;
                         size_t offset;
                 } property;
-        };
+        } x;
 };
 
 #define SD_BUS_VTABLE_START(_flags)                                     \
         {                                                               \
                 .type = _SD_BUS_VTABLE_START,                           \
                 .flags = _flags,                                        \
-                .start.element_size = sizeof(sd_bus_vtable),            \
+                .x.start.element_size = sizeof(sd_bus_vtable),          \
         }
 
 #define SD_BUS_METHOD(_member, _signature, _result, _handler, _flags)   \
         {                                                               \
                 .type = _SD_BUS_VTABLE_METHOD,                          \
                 .flags = _flags,                                        \
-                .method.member = _member,                               \
-                .method.signature = _signature,                         \
-                .method.result = _result,                               \
-                .method.handler = _handler,                             \
+                .x.method.member = _member,                             \
+                .x.method.signature = _signature,                       \
+                .x.method.result = _result,                             \
+                .x.method.handler = _handler,                           \
         }
 
 #define SD_BUS_SIGNAL(_member, _signature, _flags)                      \
         {                                                               \
                 .type = _SD_BUS_VTABLE_SIGNAL,                          \
                 .flags = _flags,                                        \
-                .signal.member = _member,                               \
-                .signal.signature = _signature,                         \
+                .x.signal.member = _member,                             \
+                .x.signal.signature = _signature,                       \
         }
 
-#define SD_BUS_PROPERTY(_member, _signature, _get, _offset, _flags) \
+#define SD_BUS_PROPERTY(_member, _signature, _get, _offset, _flags)     \
         {                                                               \
                 .type = _SD_BUS_VTABLE_PROPERTY,                        \
                 .flags = _flags,                                        \
-                .property.member = _member,                             \
-                .property.signature = _signature,                       \
-                .property.get = _get,                                   \
-                .property.offset = _offset,                             \
+                .x.property.member = _member,                           \
+                .x.property.signature = _signature,                     \
+                .x.property.get = _get,                                 \
+                .x.property.offset = _offset,                           \
         }
 
 #define SD_BUS_WRITABLE_PROPERTY(_member, _signature, _get, _set, _offset, _flags) \
         {                                                               \
                 .type = _SD_BUS_VTABLE_WRITABLE_PROPERTY,               \
                 .flags = _flags,                                        \
-                .property.member = _member,                             \
-                .property.signature = _signature,                       \
-                .property.get = _get,                                   \
-                .property.set = _set,                                   \
-                .property.offset = _offset,                             \
+                .x.property.member = _member,                           \
+                .x.property.signature = _signature,                     \
+                .x.property.get = _get,                                 \
+                .x.property.set = _set,                                 \
+                .x.property.offset = _offset,                           \
         }
 
 #define SD_BUS_VTABLE_END                                               \