diff options
author | Thomas Haller <thaller@redhat.com> | 2020-05-20 09:50:53 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-10-28 14:30:48 +0100 |
commit | 49fd96bf01ebb730c02808af5be2214e55976f9c (patch) | |
tree | e313dea2074dd8baeb4f63cd12180fa3da6e519b /libnm-core | |
parent | ed82bbe9867861e17fb1de9881ad402933a025f4 (diff) | |
download | NetworkManager-49fd96bf01ebb730c02808af5be2214e55976f9c.tar.gz |
libnm: add "nm-keyfile.h" header
Keyfile API will become part of public libnm API. Add "nm-keyfile.h"
header for that.
Diffstat (limited to 'libnm-core')
-rw-r--r-- | libnm-core/meson.build | 1 | ||||
-rw-r--r-- | libnm-core/nm-keyfile.h | 16 | ||||
-rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile-internal.h | 2 | ||||
-rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile-utils.c | 4 | ||||
-rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile.c | 6 |
5 files changed, 26 insertions, 3 deletions
diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 0509deaa54..2df54f918e 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -18,6 +18,7 @@ libnm_core_headers = files( 'nm-core-types.h', 'nm-dbus-interface.h', 'nm-errors.h', + 'nm-keyfile.h', 'nm-setting-6lowpan.h', 'nm-setting-8021x.h', 'nm-setting-adsl.h', diff --git a/libnm-core/nm-keyfile.h b/libnm-core/nm-keyfile.h new file mode 100644 index 0000000000..1b1058c28c --- /dev/null +++ b/libnm-core/nm-keyfile.h @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: LGPL-2.1+ + +#ifndef __NM_KEYFILE_H__ +#define __NM_KEYFILE_H__ + +#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION) + #error "Only <NetworkManager.h> can be included directly." +#endif + +#include "nm-core-types.h" + +G_BEGIN_DECLS + +G_END_DECLS + +#endif /* __NM_KEYFILE_H__ */ diff --git a/libnm-core/nm-keyfile/nm-keyfile-internal.h b/libnm-core/nm-keyfile/nm-keyfile-internal.h index a0a153d75c..10fc4393be 100644 --- a/libnm-core/nm-keyfile/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile/nm-keyfile-internal.h @@ -13,6 +13,8 @@ #include <sys/types.h> +#include "nm-keyfile.h" + #include "nm-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-keyfile/nm-keyfile-utils.c b/libnm-core/nm-keyfile/nm-keyfile-utils.c index 05a4412469..db2a2ea2d5 100644 --- a/libnm-core/nm-keyfile/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile/nm-keyfile-utils.c @@ -11,11 +11,13 @@ #include "nm-glib-aux/nm-str-buf.h" -#include "nm-keyfile-internal.h" +#include "nm-keyfile.h" #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" +#include "nm-keyfile-internal.h" + /*****************************************************************************/ /** diff --git a/libnm-core/nm-keyfile/nm-keyfile.c b/libnm-core/nm-keyfile/nm-keyfile.c index 4c09039d07..1c979c1d8e 100644 --- a/libnm-core/nm-keyfile/nm-keyfile.c +++ b/libnm-core/nm-keyfile/nm-keyfile.c @@ -20,11 +20,13 @@ #include "nm-glib-aux/nm-secret-utils.h" #include "systemd/nm-sd-utils-shared.h" #include "nm-libnm-core-intern/nm-common-macros.h" -#include "nm-core-internal.h" -#include "nm-keyfile-utils.h" +#include "nm-core-internal.h" +#include "nm-keyfile.h" #include "nm-setting-user.h" +#include "nm-keyfile-utils.h" + /*****************************************************************************/ typedef struct _ParseInfoProperty ParseInfoProperty; |