diff options
Diffstat (limited to 'src/systemd')
-rw-r--r-- | src/systemd/sd-bus-protocol.h | 10 | ||||
-rw-r--r-- | src/systemd/sd-bus-vtable.h | 1 | ||||
-rw-r--r-- | src/systemd/sd-bus.h | 8 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h index b2db7e46b8..1967fa8f04 100644 --- a/src/systemd/sd-bus-protocol.h +++ b/src/systemd/sd-bus-protocol.h @@ -22,8 +22,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <endian.h> - #include "_sd-common.h" _SD_BEGIN_DECLARATIONS; @@ -66,14 +64,6 @@ enum { SD_BUS_TYPE_DICT_ENTRY_END = '}', }; -/* RequestName parameters */ - -enum { - SD_BUS_NAME_ALLOW_REPLACEMENT = 1, - SD_BUS_NAME_REPLACE_EXISTING = 2, - SD_BUS_NAME_DO_NOT_QUEUE = 4 -}; - /* Well-known errors. Note that this is only a sanitized subset of the * errors that the reference implementation generates. */ diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h index 5400e9a661..cc029eb1a7 100644 --- a/src/systemd/sd-bus-vtable.h +++ b/src/systemd/sd-bus-vtable.h @@ -37,7 +37,6 @@ enum { _SD_BUS_VTABLE_SIGNAL = 'S', _SD_BUS_VTABLE_PROPERTY = 'P', _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W', - _SD_BUS_VTABLE_CHILDREN = 'C', }; enum { diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 402fc55f93..3c3cea042e 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -75,6 +75,12 @@ enum { _SD_BUS_CREDS_ALL = (1ULL << 24) -1, }; +enum { + SD_BUS_NAME_REPLACE_EXISTING = 1ULL << 0, + SD_BUS_NAME_ALLOW_REPLACEMENT = 1ULL << 1, + SD_BUS_NAME_QUEUE = 1ULL << 2, +}; + /* Callbacks */ typedef int (*sd_bus_message_handler_t)(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error); @@ -234,7 +240,7 @@ int sd_bus_message_rewind(sd_bus_message *m, int complete); /* Bus management */ int sd_bus_get_unique_name(sd_bus *bus, const char **unique); -int sd_bus_request_name(sd_bus *bus, const char *name, unsigned flags); +int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags); int sd_bus_release_name(sd_bus *bus, const char *name); int sd_bus_list_names(sd_bus *bus, char ***acquired, char ***activatable); /* free the results */ int sd_bus_get_owner(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */ |