From ad814944002b7be00307ef8ac8fcfd7a989270f3 Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Fri, 21 Feb 2025 11:02:43 +0100 Subject: [PATCH 1/2] Mark header variables as extern This is needed to get it to compile on RHEL 9. --- src/modules/systemd/libzbxsystemd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/systemd/libzbxsystemd.h b/src/modules/systemd/libzbxsystemd.h index 71f2997..70d40ac 100644 --- a/src/modules/systemd/libzbxsystemd.h +++ b/src/modules/systemd/libzbxsystemd.h @@ -32,10 +32,10 @@ #define LOG_PREFIX "[systemd] " // pid that initialised the module, before forking workers. -int mainpid; +extern int mainpid; // timeout set by host agent -int timeout; +extern int timeout; // D-Bus api #define DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" @@ -79,7 +79,7 @@ int dbus_marshall_property( #define SYSTEMD_UNIT_INTERFACE SYSTEMD_SERVICE_NAME ".Unit" #define SYSTEMD_SERVICE_INTERFACE SYSTEMD_SERVICE_NAME ".Service" -DBusConnection *conn; +extern DBusConnection *conn; int systemd_get_unit(char *s, size_t n, const char* unit); int systemd_unit_is_service(const char *path); From fe6ba3e33ed3c43dd91e804751b5b94bac93bebf Mon Sep 17 00:00:00 2001 From: Ward Poelmans Date: Sun, 23 Feb 2025 20:17:46 +0100 Subject: [PATCH 2/2] drop mainpid from libzbxsystemd header --- src/modules/systemd/libzbxsystemd.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/systemd/libzbxsystemd.h b/src/modules/systemd/libzbxsystemd.h index 70d40ac..b0bdb8c 100644 --- a/src/modules/systemd/libzbxsystemd.h +++ b/src/modules/systemd/libzbxsystemd.h @@ -31,9 +31,6 @@ #define LOG_PREFIX "[systemd] " -// pid that initialised the module, before forking workers. -extern int mainpid; - // timeout set by host agent extern int timeout;