Import Upstream version 1.12.2

1 files changed, 4 insertions, 3 deletions

diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index 5b709c02..d6a14711 100644
--- a/libnm-core/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile-internal.h
@@ -22,6 +22,10 @@
 #ifndef __NM_KEYFILE_INTERNAL_H__
 #define __NM_KEYFILE_INTERNAL_H__
 
+#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
+#error Cannot use this header.
+#endif
+
 #include <sys/types.h>
 
 #include "nm-connection.h"
@@ -90,7 +94,6 @@ typedef struct {
 	const char *message;
 } NMKeyfileReadTypeDataWarn;
 
-
 NMConnection *nm_keyfile_read (GKeyFile *keyfile,
                                const char *keyfile_name,
                                const char *base_dir,
@@ -145,7 +148,6 @@ typedef struct {
 	NMSetting8021x *setting;
 } NMKeyfileWriteTypeDataCert;
 
-
 GKeyFile *nm_keyfile_write (NMConnection *connection,
                             NMKeyfileWriteHandler handler,
                             void *user_data,
@@ -161,5 +163,4 @@ gboolean _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b);
 gboolean _nm_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order);
 gboolean _nm_keyfile_has_values (GKeyFile *keyfile);
 
-
 #endif /* __NM_KEYFILE_INTERNAL_H__ */