diff options
| author | Michael Biebl <biebl@debian.org> | 2020-04-11 21:28:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-04-11 21:28:04 +0200 |
| commit | 1e5977b62f896e844b548c3007ace9e1dfa7f9ed (patch) | |
| tree | 7a7416ed410e72b6200f3d860fd315ec11cc106b /shared/systemd/sd-adapt-shared | |
| parent | b012fa6e1d808e0736c009799c62d835cbfcc1dd (diff) | |
New upstream version 1.23.90 upstream/1.23.90
Diffstat (limited to 'shared/systemd/sd-adapt-shared')
| -rw-r--r-- | shared/systemd/sd-adapt-shared/arphrd-list.h (renamed from shared/systemd/sd-adapt-shared/missing_syscall.h) | 0 | ||||
| -rw-r--r-- | shared/systemd/sd-adapt-shared/missing_keyctl.h | 3 | ||||
| -rw-r--r-- | shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 22 |
3 files changed, 24 insertions, 1 deletions
diff --git a/shared/systemd/sd-adapt-shared/missing_syscall.h b/shared/systemd/sd-adapt-shared/arphrd-list.h index 637892c2..637892c2 100644 --- a/shared/systemd/sd-adapt-shared/missing_syscall.h +++ b/shared/systemd/sd-adapt-shared/arphrd-list.h diff --git a/shared/systemd/sd-adapt-shared/missing_keyctl.h b/shared/systemd/sd-adapt-shared/missing_keyctl.h new file mode 100644 index 00000000..637892c2 --- /dev/null +++ b/shared/systemd/sd-adapt-shared/missing_keyctl.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index 490cae92..26a043f5 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2014 - 2018 Red Hat, Inc. */ @@ -84,6 +84,8 @@ G_STMT_START { \ #include <sys/syscall.h> #include <sys/ioctl.h> +#define ENABLE_GSHADOW FALSE + /*****************************************************************************/ /* systemd cannot be compiled with "-Wdeclaration-after-statement". In particular @@ -122,6 +124,24 @@ static inline pid_t _nm_gettid(void) { #define HAVE_EXPLICIT_BZERO 0 #endif +#if defined(HAVE_DECL_PIDFD_OPEN) && HAVE_DECL_PIDFD_OPEN == 1 +#define HAVE_PIDFD_OPEN 1 +#else +#define HAVE_PIDFD_OPEN 0 +#endif + +#if defined(HAVE_DECL_PIDFD_SEND_SIGNAL) && HAVE_DECL_PIDFD_SEND_SIGNAL == 1 +#define HAVE_PIDFD_SEND_SIGNAL 1 +#else +#define HAVE_PIDFD_SEND_SIGNAL 0 +#endif + +#if defined(HAVE_DECL_RT_SIGQUEUEINFO) && HAVE_DECL_RT_SIGQUEUEINFO == 1 +#define HAVE_RT_SIGQUEUEINFO 1 +#else +#define HAVE_RT_SIGQUEUEINFO 0 +#endif + #endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */ /*****************************************************************************/ |