From 2d9a9d0dedb6cc3978896de6b8d0200740067455 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Mar 2021 07:50:01 +0100 Subject: [PATCH] core: move NM_PLATFORM_LIFETIME_PERMANENT to libnm-platform/nmp-base.h --- src/core/nm-core-utils.c | 1 + src/core/nm-core-utils.h | 2 -- 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 #include +#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,