diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /src/libnm-systemd-core/sd-adapt-core | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'src/libnm-systemd-core/sd-adapt-core')
| -rw-r--r-- | src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h | 92 |
1 files changed, 47 insertions, 45 deletions
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 4aae34b8..7ce1f8c9 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 @@ -18,7 +18,7 @@ #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD #ifndef HAVE_SYS_AUXV_H - #define HAVE_SYS_AUXV_H 0 +#define HAVE_SYS_AUXV_H 0 #endif /***************************************************************************** @@ -28,62 +28,64 @@ #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD - #include <netinet/in.h> - #include <string.h> - #include <stdio.h> - #include <errno.h> - #include <elf.h> - #ifdef HAVE_SYS_AUXV_H - #include <sys/auxv.h> - #endif - #include <unistd.h> - #include <sys/syscall.h> - #include <sys/ioctl.h> - - /* Missing in Linux 3.2.0, in Ubuntu 12.04 */ - #ifndef BPF_XOR - #define BPF_XOR 0xa0 - #endif - - #ifndef ETHERTYPE_LLDP - #define ETHERTYPE_LLDP 0x88cc - #endif - - #ifndef HAVE_SECURE_GETENV - #ifdef HAVE___SECURE_GETENV - #define secure_getenv __secure_getenv - #else - #error neither secure_getenv nor __secure_getenv is available - #endif - #endif - - #include "libnm-base/nm-base.h" +#include <netinet/in.h> +#include <string.h> +#include <stdio.h> +#include <errno.h> +#include <elf.h> +#ifdef HAVE_SYS_AUXV_H +#include <sys/auxv.h> +#endif +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/ioctl.h> + +/* Missing in Linux 3.2.0, in Ubuntu 12.04 */ +#ifndef BPF_XOR +#define BPF_XOR 0xa0 +#endif + +#ifndef ETHERTYPE_LLDP +#define ETHERTYPE_LLDP 0x88cc +#endif + +#ifndef HAVE_SECURE_GETENV +#ifdef HAVE___SECURE_GETENV +#define secure_getenv __secure_getenv +#else +#error neither secure_getenv nor __secure_getenv is available +#endif +#endif + +#include "libnm-base/nm-base.h" /*****************************************************************************/ +#define HAVE_OPENSSL 0 + static inline int sd_notify(int unset_environment, const char *state) { return 0; } - /* Can't include both net/if.h and linux/if.h; so have to define this here */ - #ifndef IF_NAMESIZE - #define IF_NAMESIZE 16 - #endif +/* Can't include both net/if.h and linux/if.h; so have to define this here */ +#ifndef IF_NAMESIZE +#define IF_NAMESIZE 16 +#endif - #ifndef IFNAMSIZ - #define IFNAMSIZ IF_NAMESIZE - #endif +#ifndef IFNAMSIZ +#define IFNAMSIZ IF_NAMESIZE +#endif - #ifndef MAX_HANDLE_SZ - #define MAX_HANDLE_SZ 128 - #endif +#ifndef MAX_HANDLE_SZ +#define MAX_HANDLE_SZ 128 +#endif - #include "sd-id128.h" - #include "sparse-endian.h" - #include "async.h" - #include "util.h" +#include "sd-id128.h" +#include "sparse-endian.h" +#include "async.h" +#include "util.h" #endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */ |