From 1a108beb3c78684a52dbdd7416586f45005f51bd Mon Sep 17 00:00:00 2001
From: Robert Love <rml@novell.com>
Date: Mon, 16 Jan 2006 17:18:43 +0000
Subject: [PATCH] 2006-01-16  Robert Love  <rml@novell.com>

	Patch from Timo Hoenig  <thoenig@suse.de:
	* libnm-util/cipher-wep-ascii.h, libnm-util/cipher-wep-hex.h,
	  libnm-util/cipher-wep-passphrase.h, libnm-util/cipher-wpa-psk-hex.h,
	  libnm-util/cipher-wpa-psk-passphrase.h, libnm-util/cipher.h,
	  libnm-util/dbus-helpers.h: add checks whether headers are used
	  within a C++ build.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1336 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 ChangeLog                              | 9 +++++++++
 configure.in                           | 2 +-
 libnm-util/cipher-wep-ascii.h          | 8 ++++++++
 libnm-util/cipher-wep-hex.h            | 8 ++++++++
 libnm-util/cipher-wep-passphrase.h     | 8 ++++++++
 libnm-util/cipher-wpa-psk-hex.h        | 8 ++++++++
 libnm-util/cipher-wpa-psk-passphrase.h | 8 ++++++++
 libnm-util/cipher.h                    | 8 ++++++++
 libnm-util/dbus-helpers.h              | 8 ++++++++
 9 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 078e29746c..a974695da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-16  Robert Love  <rml@novell.com>
+
+	Patch from Timo Hoenig  <thoenig@suse.de:
+	* libnm-util/cipher-wep-ascii.h, libnm-util/cipher-wep-hex.h,
+	  libnm-util/cipher-wep-passphrase.h, libnm-util/cipher-wpa-psk-hex.h,
+	  libnm-util/cipher-wpa-psk-passphrase.h, libnm-util/cipher.h,
+	  libnm-util/dbus-helpers.h: add checks whether headers are used
+	  within a C++ build.
+
 2006-01-16  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/wireless-security-option.c
diff --git a/configure.in b/configure.in
index 4fad95b088..cf8d1aef72 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager, 0.5.1, dcbw@redhat.com, NetworkManager)
+AC_INIT(NetworkManager, 0.5.1cvs20060116, dcbw@redhat.com, NetworkManager)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
diff --git a/libnm-util/cipher-wep-ascii.h b/libnm-util/cipher-wep-ascii.h
index bddd5668c3..8b9fb8ff46 100644
--- a/libnm-util/cipher-wep-ascii.h
+++ b/libnm-util/cipher-wep-ascii.h
@@ -22,7 +22,15 @@
 #ifndef CIPHER_WEP_ASCII_H
 #define CIPHER_WEP_ASCII_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 IEEE_802_11_Cipher * cipher_wep128_ascii_new (void);
 IEEE_802_11_Cipher * cipher_wep64_ascii_new (void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* CIPHER_WEP_ASCII_H */
diff --git a/libnm-util/cipher-wep-hex.h b/libnm-util/cipher-wep-hex.h
index eb9cdf0440..51e9d7029e 100644
--- a/libnm-util/cipher-wep-hex.h
+++ b/libnm-util/cipher-wep-hex.h
@@ -22,7 +22,15 @@
 #ifndef CIPHER_WEP_HEX_H
 #define CIPHER_WEP_HEX_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 IEEE_802_11_Cipher * cipher_wep128_hex_new (void);
 IEEE_802_11_Cipher * cipher_wep64_hex_new (void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* CIPHER_WEP_HEX_H */
diff --git a/libnm-util/cipher-wep-passphrase.h b/libnm-util/cipher-wep-passphrase.h
index 67145291e2..1a90bda719 100644
--- a/libnm-util/cipher-wep-passphrase.h
+++ b/libnm-util/cipher-wep-passphrase.h
@@ -22,7 +22,15 @@
 #ifndef CIPHER_WEP_PASSPHRASE_H
 #define CIPHER_WEP_PASSPHRASE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 IEEE_802_11_Cipher * cipher_wep128_passphrase_new (void);
 IEEE_802_11_Cipher * cipher_wep64_passphrase_new (void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* CIPHER_WEP_PASSPHRASE_H */
diff --git a/libnm-util/cipher-wpa-psk-hex.h b/libnm-util/cipher-wpa-psk-hex.h
index 6db379e6d3..e9aec8ba5b 100644
--- a/libnm-util/cipher-wpa-psk-hex.h
+++ b/libnm-util/cipher-wpa-psk-hex.h
@@ -22,10 +22,18 @@
 #ifndef CIPHER_WPA_PSK_HEX_H
 #define CIPHER_WPA_PSK_HEX_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define WPA_PMK_LEN 32
 
 IEEE_802_11_Cipher * cipher_wpa_psk_hex_new (void);
 
 void cipher_wpa_psk_hex_set_we_cipher (IEEE_802_11_Cipher *cipher, int we_cipher);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* CIPHER_WPA_PSK_HEX_H */
diff --git a/libnm-util/cipher-wpa-psk-passphrase.h b/libnm-util/cipher-wpa-psk-passphrase.h
index ff09434441..ab3dbc3ca1 100644
--- a/libnm-util/cipher-wpa-psk-passphrase.h
+++ b/libnm-util/cipher-wpa-psk-passphrase.h
@@ -22,8 +22,16 @@
 #ifndef CIPHER_WPA_PSK_PASSPHRASE_H
 #define CIPHER_WPA_PSK_PASSPHRASE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 IEEE_802_11_Cipher * cipher_wpa_psk_passphrase_new (void);
 
 void cipher_wpa_psk_passphrase_set_we_cipher (IEEE_802_11_Cipher *cipher, int we_cipher);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* CIPHER_WPA_PSK_PASSPHRASE_H */
diff --git a/libnm-util/cipher.h b/libnm-util/cipher.h
index 20c95bc89d..1a7b155949 100644
--- a/libnm-util/cipher.h
+++ b/libnm-util/cipher.h
@@ -22,6 +22,10 @@
 #ifndef CIPHER_H
 #define CIPHER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct IEEE_802_11_Cipher IEEE_802_11_Cipher;
 
 void          ieee_802_11_cipher_ref (IEEE_802_11_Cipher *cipher);
@@ -35,4 +39,8 @@ int           ieee_802_11_cipher_validate (IEEE_802_11_Cipher *cipher, const cha
 /* Private API members (not part of the public API) */
 int           ieee_802_11_cipher_refcount (IEEE_802_11_Cipher *cipher);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* CIPHER_H */
diff --git a/libnm-util/dbus-helpers.h b/libnm-util/dbus-helpers.h
index c5b076b9b6..553938d6e9 100644
--- a/libnm-util/dbus-helpers.h
+++ b/libnm-util/dbus-helpers.h
@@ -26,6 +26,10 @@
 
 #include "cipher.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 dbus_bool_t	nmu_security_serialize_wep (DBusMessageIter *iter,
                                         const char *key,
                                         int auth_alg);
@@ -67,4 +71,8 @@ DBusMessage *	nmu_create_dbus_error_message (DBusMessage *message,
                                         const char *format,
                                         ...);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* DBUS_HELPERS_H */