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.

6 files changed, 15 insertions, 15 deletions

diff --git a/src/supplicant-manager/nm-call-store.h b/src/supplicant-manager/nm-call-store.h
index b24c97a465..bcee54cfbb 100644
--- a/src/supplicant-manager/nm-call-store.h
+++ b/src/supplicant-manager/nm-call-store.h
@@ -18,8 +18,8 @@
  * (C) Copyright 2007 Novell, Inc.
  */
 
-#ifndef NM_CALLBACK_STORE_H
-#define NM_CALLBACK_STORE_H
+#ifndef __NETWORKMANAGER_CALLBACK_STORE_H__
+#define __NETWORKMANAGER_CALLBACK_STORE_H__
 
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
@@ -38,4 +38,4 @@ void         nm_call_store_remove  (NMCallStore *store,
 void         nm_call_store_clear   (NMCallStore *store);
 void         nm_call_store_destroy (NMCallStore *store);
 
-#endif /* NM_CALLBACK_STORE_H */
+#endif /* __NETWORKMANAGER_CALLBACK_STORE_H__ */
diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h
index 75d6b779ff..482e3545b6 100644
--- a/src/supplicant-manager/nm-supplicant-config.h
+++ b/src/supplicant-manager/nm-supplicant-config.h
@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SUPPLICANT_CONFIG_H
-#define NM_SUPPLICANT_CONFIG_H
+#ifndef __NETWORKMANAGER_SUPPLICANT_CONFIG_H__
+#define __NETWORKMANAGER_SUPPLICANT_CONFIG_H__
 
 #include <glib-object.h>
 #include <nm-setting-wireless.h>
diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h
index 633c16cc56..47ccc79493 100644
--- a/src/supplicant-manager/nm-supplicant-interface.h
+++ b/src/supplicant-manager/nm-supplicant-interface.h
@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SUPPLICANT_INTERFACE_H
-#define NM_SUPPLICANT_INTERFACE_H
+#ifndef __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__
+#define __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__
 
 #include <glib-object.h>
 #include <dbus/dbus.h>
diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h
index 9e2f3b21b1..5e7f1eb596 100644
--- a/src/supplicant-manager/nm-supplicant-manager.h
+++ b/src/supplicant-manager/nm-supplicant-manager.h
@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SUPPLICANT_MANAGER_H
-#define NM_SUPPLICANT_MANAGER_H
+#ifndef __NETWORKMANAGER_SUPPLICANT_MANAGER_H__
+#define __NETWORKMANAGER_SUPPLICANT_MANAGER_H__
 
 #include <glib-object.h>
 #include "nm-supplicant-types.h"
@@ -65,4 +65,4 @@ void nm_supplicant_manager_iface_release (NMSupplicantManager *mgr,
 
 gboolean nm_supplicant_manager_available (NMSupplicantManager *mgr);
 
-#endif /* NM_SUPPLICANT_MANAGER_H */
+#endif /* __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ */
diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.h b/src/supplicant-manager/nm-supplicant-settings-verify.h
index eb213e0e8d..920343bac9 100644
--- a/src/supplicant-manager/nm-supplicant-settings-verify.h
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.h
@@ -18,8 +18,8 @@
  * Copyright (C) 2006 - 2008 Red Hat, Inc.
  */
 
-#ifndef NM_SUPPLICANT_SETTINGS_VERIFY_H
-#define NM_SUPPLICANT_SETTINGS_VERIFY_H
+#ifndef __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__
+#define __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__
 
 typedef enum {
 	TYPE_INVALID = 0,
@@ -35,4 +35,4 @@ OptType nm_supplicant_settings_verify_setting (const char * key,
                                                const guint32 len);
 
 
-#endif /* NM_SUPPLICANT_SETTINGS_VERIFY_H */
+#endif /* __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__ */
diff --git a/src/supplicant-manager/nm-supplicant-types.h b/src/supplicant-manager/nm-supplicant-types.h
index 16e4a6ba4d..619f0c3e91 100644
--- a/src/supplicant-manager/nm-supplicant-types.h
+++ b/src/supplicant-manager/nm-supplicant-types.h
@@ -18,8 +18,8 @@
  * Copyright (C) 2006 - 2008 Red Hat, Inc.
  */
 
-#ifndef NM_SUPPLICANT_TYPES_H
-#define NM_SUPPLICANT_TYPES_H
+#ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__
+#define __NETWORKMANAGER_SUPPLICANT_TYPES_H__
 
 typedef struct _NMSupplicantManager NMSupplicantManager;
 typedef struct _NMSupplicantInterface NMSupplicantInterface;