From 782b85bf13fdb0ca7a462d46d56a5aa764bab194 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 20 Dec 2017 12:09:47 +0100 Subject: [PATCH] settings: drop unused define for HOSTNAME_FILE Fixes: 5bfb7c3c89afe4da5b1ac2395391e9a986c722f0 (cherry picked from commit 7deb3b4fb5bc7b71e66cd6c85694f218a01f2334) --- src/settings/nm-settings.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index d54305c137..51b7bea7a5 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -89,21 +89,6 @@ EXPORT(nm_settings_connection_update) /*****************************************************************************/ static NM_CACHED_QUARK_FCN ("plugin-module-path", plugin_module_path_quark) - -#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) + defined(HOSTNAME_PERSIST_GENTOO)) > 1 -#error "Can only define one of HOSTNAME_PERSIST_*" -#endif - -#if defined(HOSTNAME_PERSIST_SUSE) -#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME -#elif defined(HOSTNAME_PERSIST_SLACKWARE) -#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME -#elif defined(HOSTNAME_PERSIST_GENTOO) -#define HOSTNAME_FILE HOSTNAME_FILE_GENTOO -#else -#define HOSTNAME_FILE HOSTNAME_FILE_DEFAULT -#endif - static NM_CACHED_QUARK_FCN ("default-wired-connection", _default_wired_connection_quark) static NM_CACHED_QUARK_FCN ("default-wired-device", _default_wired_device_quark)