From 28c79aaa33931eca680176cfc0faa7d5e6e1be65 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Jun 2015 15:26:56 +0200 Subject: [PATCH] platform: declare NMPObjectType in nm-types.h We want to use it outside of NMPlatform, but users should not be required to include "nmp-object.h". (cherry picked from commit b6061b3cd5e694d492ae647b9ef1ce62621948bf) --- src/nm-types.h | 11 +++++++++++ src/platform/nmp-object.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/nm-types.h b/src/nm-types.h index 7ba72feb34..2fdd1e5ad6 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -116,6 +116,17 @@ typedef enum { NM_LINK_TYPE_TEAM, } NMLinkType; +typedef enum { + OBJECT_TYPE_UNKNOWN, + NMP_OBJECT_TYPE_LINK, + NMP_OBJECT_TYPE_IP4_ADDRESS, + NMP_OBJECT_TYPE_IP6_ADDRESS, + NMP_OBJECT_TYPE_IP4_ROUTE, + NMP_OBJECT_TYPE_IP6_ROUTE, + __OBJECT_TYPE_LAST, + OBJECT_TYPE_MAX = __OBJECT_TYPE_LAST - 1, +} NMPObjectType; + /* settings */ typedef struct _NMAgentManager NMAgentManager; typedef struct _NMSecretAgent NMSecretAgent; diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h index 539f90a776..6933f9902e 100644 --- a/src/platform/nmp-object.h +++ b/src/platform/nmp-object.h @@ -31,17 +31,6 @@ #include -typedef enum { - OBJECT_TYPE_UNKNOWN, - NMP_OBJECT_TYPE_LINK, - NMP_OBJECT_TYPE_IP4_ADDRESS, - NMP_OBJECT_TYPE_IP6_ADDRESS, - NMP_OBJECT_TYPE_IP4_ROUTE, - NMP_OBJECT_TYPE_IP6_ROUTE, - __OBJECT_TYPE_LAST, - OBJECT_TYPE_MAX = __OBJECT_TYPE_LAST - 1, -} NMPObjectType; - typedef enum { /*< skip >*/ NMP_OBJECT_TO_STRING_ID, NMP_OBJECT_TO_STRING_PUBLIC,