diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
| commit | 9bc3ff81969c896f6bf8e1c93f98f43f6ffffaf8 (patch) | |
| tree | 302fce2d1ab3a130ac0b684d168ab6312825fcd2 /shared/nm-default.h | |
| parent | f97666c6bd29a3228443acd6401a407a19ec8d25 (diff) | |
| parent | 9a6dcbf895f9da01768e64b73cec88c16157d91e (diff) | |
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0' with Debian dir a0f3ffb137940d423625faae8bedbaced4d34cda
Diffstat (limited to 'shared/nm-default.h')
| -rw-r--r-- | shared/nm-default.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shared/nm-default.h b/shared/nm-default.h index 8bcc5c70..26d6476a 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -78,9 +78,14 @@ | NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON \ ) +#define NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED ( 0 \ + | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB \ + | NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD \ + ) + #define NM_NETWORKMANAGER_COMPILATION_SYSTEMD ( 0 \ | NM_NETWORKMANAGER_COMPILATION_DAEMON \ - | NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD \ + | NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \ ) #define NM_NETWORKMANAGER_COMPILATION_GLIB ( 0 \ @@ -179,7 +184,7 @@ #if NM_MORE_ASSERTS == 0 #ifndef G_DISABLE_CAST_CHECKS /* Unless compiling with G_DISABLE_CAST_CHECKS, glib performs type checking - * during G_VARIANT_TYPE() via g_variant_type_checked_(). This is not necesary + * during G_VARIANT_TYPE() via g_variant_type_checked_(). This is not necessary * because commonly this cast is needed during something like * * g_variant_builder_init (&props, G_VARIANT_TYPE ("a{sv}")); @@ -287,6 +292,7 @@ _nm_g_return_if_fail_warning (const char *log_domain, #include "nm-utils/nm-macros-internal.h" #include "nm-utils/nm-shared-utils.h" +#include "nm-utils/nm-errno.h" #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL /* no hash-utils in legacy code. */ @@ -303,6 +309,7 @@ _nm_g_return_if_fail_warning (const char *log_domain, /*****************************************************************************/ #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON +#include "nm-core-types.h" #include "nm-types.h" #include "nm-logging.h" #endif |