diff options
Diffstat (limited to 'shared/nm-default.h')
| -rw-r--r-- | shared/nm-default.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/shared/nm-default.h b/shared/nm-default.h index 54e99167..16a756c2 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* NetworkManager -- Network link manager * * This library is free software; you can redistribute it and/or @@ -30,8 +29,6 @@ #define NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE (1 << 5) #define NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL (1 << 6) #define NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE (1 << 7) -#define NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL (1 << 8) -#define NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_GLIB (1 << 9) #define NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON (1 << 10) #define NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD (1 << 11) @@ -52,17 +49,6 @@ | NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL \ ) -#define NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL ( 0 \ - | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB \ - | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB \ - | NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL \ - ) - -#define NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB ( 0 \ - | NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ - | NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_GLIB \ - ) - #define NM_NETWORKMANAGER_COMPILATION_CLIENT ( 0 \ | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB \ | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG \ @@ -293,16 +279,11 @@ _nm_g_return_if_fail_warning (const char *log_domain, #include "nm-glib-aux/nm-macros-internal.h" #include "nm-glib-aux/nm-shared-utils.h" #include "nm-glib-aux/nm-errno.h" - -#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL -/* no hash-utils in legacy code. */ -#else #include "nm-glib-aux/nm-hash-utils.h" -#endif /*****************************************************************************/ -#if (NETWORKMANAGER_COMPILATION) & (NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE | NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL) +#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE #include "nm-version.h" #endif |