libnm: include "nm-libnm-utils.h" by default in libnm sources

The majority of sources in "libnm/" are implementations of NMObject.
"nm-libnm-utils.h" will contain common definitions for handling such
objects. This means, most of the source files under libnm will require
this include. Include it by default.
This commit is contained in:
Thomas Haller 2019-10-17 08:15:44 +02:00
parent 419ce1178e
commit 4400f6de77
6 changed files with 4 additions and 5 deletions

View file

@ -11,7 +11,6 @@
#include <libudev.h>
#include "nm-glib-aux/nm-dbus-aux.h"
#include "nm-libnm-utils.h"
#include "nm-dbus-interface.h"
#include "nm-active-connection.h"
#include "nm-device-bt.h"

View file

@ -13,7 +13,6 @@
#include "nm-object.h"
#include "nm-client.h"
#include "nm-libnm-utils.h"
#define NM_TYPE_MANAGER (nm_manager_get_type ())
#define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager))

View file

@ -12,7 +12,6 @@
#include <stdio.h>
#include "nm-utils.h"
#include "nm-libnm-utils.h"
#include "nm-dbus-interface.h"
#include "nm-object-private.h"
#include "nm-dbus-helpers.h"

View file

@ -12,7 +12,6 @@
#endif
#include "nm-object.h"
#include "nm-libnm-utils.h"
#define NM_TYPE_REMOTE_SETTINGS (nm_remote_settings_get_type ())
#define NM_REMOTE_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettings))

View file

@ -12,7 +12,6 @@
#include <sys/mman.h>
#include "nm-libnm-utils.h"
#include "nm-vpn-service-plugin.h"
#include "nm-utils/nm-test-utils.h"

View file

@ -280,6 +280,10 @@ _nm_g_return_if_fail_warning (const char *log_domain,
#include "nm-logging.h"
#endif
#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE
#include "nm-libnm-utils.h"
#endif
#if ((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM) && !((NETWORKMANAGER_COMPILATION) & (NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE | NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL))
#include "NetworkManager.h"
#endif