diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-03-04 07:50:01 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-03-05 11:27:15 +0100 |
| commit | 2d9a9d0dedb6cc3978896de6b8d0200740067455 (patch) | |
| tree | e2c28766a2a18b736c4c317e3208fb7d36b9cd2d | |
| parent | 398b50993169714b0078f1f5ad51b75e4ca2d458 (diff) | |
| download | NetworkManager-2d9a9d0dedb6cc3978896de6b8d0200740067455.tar.gz | |
core: move NM_PLATFORM_LIFETIME_PERMANENT to libnm-platform/nmp-base.h
| -rw-r--r-- | src/core/nm-core-utils.c | 1 | ||||
| -rw-r--r-- | src/core/nm-core-utils.h | 2 | ||||
| -rw-r--r-- | src/libnm-platform/nmp-base.h | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 6d6c8ef920..ac98419a32 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -22,6 +22,7 @@ #include <net/if_arp.h> #include <net/ethernet.h> +#include "libnm-platform/nmp-base.h" #include "libnm-std-aux/unaligned.h" #include "libnm-glib-aux/nm-random-utils.h" #include "libnm-glib-aux/nm-io-utils.h" diff --git a/src/core/nm-core-utils.h b/src/core/nm-core-utils.h index 91ebbe8d26..5e89634fab 100644 --- a/src/core/nm-core-utils.h +++ b/src/core/nm-core-utils.h @@ -16,8 +16,6 @@ /*****************************************************************************/ -#define NM_PLATFORM_LIFETIME_PERMANENT G_MAXUINT32 - #define NM_DEFINE_SINGLETON_INSTANCE(TYPE) static TYPE *singleton_instance #define NM_DEFINE_SINGLETON_REGISTER(TYPE) \ diff --git a/src/libnm-platform/nmp-base.h b/src/libnm-platform/nmp-base.h index e5f134185c..73ac56a409 100644 --- a/src/libnm-platform/nmp-base.h +++ b/src/libnm-platform/nmp-base.h @@ -7,6 +7,10 @@ /*****************************************************************************/ +#define NM_PLATFORM_LIFETIME_PERMANENT G_MAXUINT32 + +/*****************************************************************************/ + typedef enum { NM_PLATFORM_LINK_DUPLEX_UNKNOWN, NM_PLATFORM_LINK_DUPLEX_HALF, |