diff --git a/config.h.meson b/config.h.meson index ae2c2d0db..b87481291 100644 --- a/config.h.meson +++ b/config.h.meson @@ -320,8 +320,8 @@ /* Define to 1 if you have the header file. */ #mesondefine HAVE_WINSOCK2_H -/* for the systemd header files */ -#mesondefine HAVE_SYSTEMD_DAEMON +/* For libsystemd */ +#mesondefine HAVE_SYSTEMD /* Define to 1 if native HSP backend is enabled in bluez5 plugin. */ #mesondefine HAVE_BLUEZ_5_BACKEND_NATIVE diff --git a/meson.build b/meson.build index d165d9c7f..afc4bbb9e 100644 --- a/meson.build +++ b/meson.build @@ -279,9 +279,9 @@ if get_option('systemd') systemd = dependency('systemd', required: false) systemd_dep = dependency('libsystemd', required: false) if systemd.found() and systemd_dep.found() - cdata.set('HAVE_SYSTEMD_DAEMON', 1) + cdata.set('HAVE_SYSTEMD', 1) else - warning('Systemd integration was enabled, but systemd is not available') + warning('systemd integration was enabled, but systemd is not available') endif endif diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c index c02a39a5a..c22a76354 100644 --- a/src/modules/module-protocol-native.c +++ b/src/modules/module-protocol-native.c @@ -40,7 +40,7 @@ #include #include -#ifdef HAVE_SYSTEMD_DAEMON +#ifdef HAVE_SYSTEMD #include #endif @@ -576,7 +576,7 @@ static int add_socket(struct pw_protocol *protocol, struct server *s) int fd = -1, res; bool activated = false; -#ifdef HAVE_SYSTEMD_DAEMON +#ifdef HAVE_SYSTEMD { int i, n = sd_listen_fds(0); for (i = 0; i < n; ++i) {