all: fix up multiple-include-guard defines

Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
guard, which meant that nm-test-utils.h could not tell which of them
was being included (and so, eg, if you tried to include
nm-ip4-config.h in a libnm test, it would fail to compile because
nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).

Fix this by changing the include guards in the non-API-stable parts of
the tree:

  - libnm-glib/nm-ip4-config.h remains   NM_IP4_CONFIG_H
  - libnm/nm-ip4-config.h now uses     __NM_IP4_CONFIG_H__
  - src/nm-ip4-config.h now uses       __NETWORKMANAGER_IP4_CONFIG_H__

And likewise for all other headers.

The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
__NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
consistent with the general scheme, do still mostly make sense in
isolation.

5 files changed, 14 insertions, 14 deletions

diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns-manager/nm-dns-dnsmasq.h
index 70933c0f12..fc80f07940 100644
--- a/src/dns-manager/nm-dns-dnsmasq.h
+++ b/src/dns-manager/nm-dns-dnsmasq.h
@@ -16,8 +16,8 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#ifndef NM_DNS_DNSMASQ_H
-#define NM_DNS_DNSMASQ_H
+#ifndef __NETWORKMANAGER_DNS_DNSMASQ_H__
+#define __NETWORKMANAGER_DNS_DNSMASQ_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -43,5 +43,5 @@ GType nm_dns_dnsmasq_get_type (void);
 
 NMDnsPlugin *nm_dns_dnsmasq_new (void);
 
-#endif /* NM_DNS_DNSMASQ_H */
+#endif /* __NETWORKMANAGER_DNS_DNSMASQ_H__ */
 
diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h
index b2bf2467c2..238d924a8c 100644
--- a/src/dns-manager/nm-dns-manager.h
+++ b/src/dns-manager/nm-dns-manager.h
@@ -21,8 +21,8 @@
  *   and others
  */
 
-#ifndef NM_DNS_MANAGER_H
-#define NM_DNS_MANAGER_H
+#ifndef __NETWORKMANAGER_DNS_MANAGER_H__
+#define __NETWORKMANAGER_DNS_MANAGER_H__
 
 #include <glib-object.h>
 #include <dbus/dbus.h>
@@ -114,4 +114,4 @@ NMDnsManagerResolvConfMode nm_dns_manager_get_resolv_conf_mode (NMDnsManager *mg
 
 G_END_DECLS
 
-#endif /* NM_DNS_MANAGER_H */
+#endif /* __NETWORKMANAGER_DNS_MANAGER_H__ */
diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h
index 41a12a58e3..ee735a5abf 100644
--- a/src/dns-manager/nm-dns-plugin.h
+++ b/src/dns-manager/nm-dns-plugin.h
@@ -16,8 +16,8 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#ifndef NM_DNS_PLUGIN_H
-#define NM_DNS_PLUGIN_H
+#ifndef __NETWORKMANAGER_DNS_PLUGIN_H__
+#define __NETWORKMANAGER_DNS_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -109,5 +109,5 @@ GPid nm_dns_plugin_child_spawn (NMDnsPlugin *self,
 
 gboolean nm_dns_plugin_child_kill (NMDnsPlugin *self);
 
-#endif /* NM_DNS_PLUGIN_H */
+#endif /* __NETWORKMANAGER_DNS_PLUGIN_H__ */
 
diff --git a/src/dns-manager/nm-dns-unbound.h b/src/dns-manager/nm-dns-unbound.h
index 2aaae7dd4b..261326b2d4 100644
--- a/src/dns-manager/nm-dns-unbound.h
+++ b/src/dns-manager/nm-dns-unbound.h
@@ -15,8 +15,8 @@
  *
  * Copyright (C) 2014 Red Hat, Inc.
  */
-#ifndef NM_DNS_UNBOUND_H
-#define NM_DNS_UNBOUND_H
+#ifndef __NETWORKMANAGER_DNS_UNBOUND_H__
+#define __NETWORKMANAGER_DNS_UNBOUND_H__
 
 #include <glib-object.h>
 
@@ -41,4 +41,4 @@ GType nm_dns_unbound_get_type (void);
 
 NMDnsPlugin *nm_dns_unbound_new (void);
 
-#endif /* NM_DNS_UNBOUND_H */
+#endif /* __NETWORKMANAGER_DNS_UNBOUND_H__ */
diff --git a/src/dns-manager/nm-dns-utils.h b/src/dns-manager/nm-dns-utils.h
index daa6711cce..75c6b0608f 100644
--- a/src/dns-manager/nm-dns-utils.h
+++ b/src/dns-manager/nm-dns-utils.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef NM_DNS_UTILS_H
-#define NM_DNS_UTILS_H
+#ifndef __NETWORKMANAGER_DNS_UTILS_H__
+#define __NETWORKMANAGER_DNS_UTILS_H__
 
 #include "nm-ip4-config.h"