From 05e4a733f2141995181a551854d5df929f084adf Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 9 Aug 2023 21:55:35 +0200 Subject: New upstream version 1.44.0 --- src/libnm-systemd-core/sd-adapt-core/device-util.h | 3 --- src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c | 15 +++++++++++++++ src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h | 10 +++++++++- src/libnm-systemd-core/sd-adapt-core/sd-device.h | 3 --- src/libnm-systemd-core/sd-adapt-core/sd-messages.h | 3 +++ 5 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 src/libnm-systemd-core/sd-adapt-core/device-util.h delete mode 100644 src/libnm-systemd-core/sd-adapt-core/sd-device.h create mode 100644 src/libnm-systemd-core/sd-adapt-core/sd-messages.h (limited to 'src/libnm-systemd-core/sd-adapt-core') diff --git a/src/libnm-systemd-core/sd-adapt-core/device-util.h b/src/libnm-systemd-core/sd-adapt-core/device-util.h deleted file mode 100644 index 637892c2..00000000 --- a/src/libnm-systemd-core/sd-adapt-core/device-util.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -/* dummy header */ diff --git a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c index e4d2d2e1..c5ef63eb 100644 --- a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c +++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c @@ -8,6 +8,7 @@ #include "nm-sd-adapt-core.h" #include "fd-util.h" +#include "sd-device.h" /*****************************************************************************/ @@ -19,3 +20,17 @@ asynchronous_close(int fd) } /*****************************************************************************/ + +sd_device * +sd_device_ref(sd_device *self) +{ + g_return_val_if_fail(!self, self); + return self; +} + +sd_device * +sd_device_unref(sd_device *self) +{ + g_return_val_if_fail(!self, self); + return self; +} diff --git a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h index 7ce1f8c9..9c317801 100644 --- a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h @@ -40,6 +40,8 @@ #include #include +#define HAVE_EPOLL_PWAIT2 0 + /* Missing in Linux 3.2.0, in Ubuntu 12.04 */ #ifndef BPF_XOR #define BPF_XOR 0xa0 @@ -85,8 +87,14 @@ sd_notify(int unset_environment, const char *state) #include "sd-id128.h" #include "sparse-endian.h" #include "async.h" -#include "util.h" #endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */ +/*****************************************************************************/ + +struct sd_device; + +struct sd_device *sd_device_ref(struct sd_device *self); +struct sd_device *sd_device_unref(struct sd_device *self); + #endif /* __NM_SD_ADAPT_CORE_H__ */ diff --git a/src/libnm-systemd-core/sd-adapt-core/sd-device.h b/src/libnm-systemd-core/sd-adapt-core/sd-device.h deleted file mode 100644 index 637892c2..00000000 --- a/src/libnm-systemd-core/sd-adapt-core/sd-device.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -/* dummy header */ diff --git a/src/libnm-systemd-core/sd-adapt-core/sd-messages.h b/src/libnm-systemd-core/sd-adapt-core/sd-messages.h new file mode 100644 index 00000000..637892c2 --- /dev/null +++ b/src/libnm-systemd-core/sd-adapt-core/sd-messages.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ -- cgit 1.3.0-6-gf8a5