diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-06-17 19:06:13 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-06-17 19:06:13 +0200 |
| commit | 633f2d59edeb3aa9cf88454780d55fac2e4dbe8d (patch) | |
| tree | 18a6a29c7d5f6dd0e5af54a7859898d96c78601d /src/basic/def.h | |
| parent | 14f494c710bec8fcbadb5f46a9c25b9ebf367f19 (diff) | |
| parent | 1b09f548c7f303b486b5b1321c06336bff72ada4 (diff) | |
Merge pull request #263 from kaysievers/wip
turn kdbus support into a runtime option
Diffstat (limited to 'src/basic/def.h')
| -rw-r--r-- | src/basic/def.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/basic/def.h b/src/basic/def.h index 011c7c667e..5aaba1fe87 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -63,13 +63,7 @@ #define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket" #define KERNEL_SYSTEM_BUS_ADDRESS "kernel:path=/sys/fs/kdbus/0-system/bus" - -#ifdef ENABLE_KDBUS -# define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS -#else -# define DEFAULT_SYSTEM_BUS_ADDRESS UNIX_SYSTEM_BUS_ADDRESS -#endif - +#define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS #define UNIX_USER_BUS_ADDRESS_FMT "unix:path=%s/bus" #define KERNEL_USER_BUS_ADDRESS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus" |