# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1162932022 0
# Node ID 500a8f54354ea6923cf13f8a6134e6a7813bcc43
# Parent  8d9a473bbab901061fd166c079b26b1b8619d634
[gaim-migrate @ 17698]
Add extern "C" guards to header files which are missing it. This should fix problems similar to SF Bug #1592175. Also, while I was at it, I made the _GaimStringref definition private. It already had a warning to not use it directly, so it should really be safe to make private.

committer: Tailor Script <tailor@pidgin.im>

diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/dnssrv.h
--- a/libgaim/dnssrv.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/dnssrv.h	Tue Nov 07 20:40:22 2006 +0000
@@ -23,6 +23,10 @@
 #ifndef _GAIM_DNSSRV_H
 #define _GAIM_DNSSRV_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _GaimSrvResponse GaimSrvResponse;
 typedef struct _GaimSrvQueryData GaimSrvQueryData;
 
@@ -53,4 +57,8 @@
  */
 void gaim_srv_cancel(GaimSrvQueryData *query_data);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GAIM_DNSSRV_H */
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/mime.h
--- a/libgaim/mime.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/mime.h	Tue Nov 07 20:40:22 2006 +0000
@@ -27,6 +27,10 @@
 #include <glib.h>
 #include <glib/glist.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file mime.h
  * @ingroup core
@@ -208,4 +212,8 @@
 
 void gaim_mime_part_set_data(GaimMimePart *part, const char *data);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/ntlm.h
--- a/libgaim/ntlm.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/ntlm.h	Tue Nov 07 20:40:22 2006 +0000
@@ -26,6 +26,10 @@
 #ifndef _GAIM_NTLM_H
 #define _GAIM_NTLM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Generates the base64 encoded type 1 message needed for NTLM authentication
  *
@@ -61,4 +65,8 @@
  */
 gchar *gaim_ntlm_gen_type3(const gchar *username, const gchar *passw, const gchar *hostname, const gchar *domain, const guint8 *nonce, guint32 *flags);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GAIM_NTLM_H */
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/status.h
--- a/libgaim/status.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/status.h	Tue Nov 07 20:40:22 2006 +0000
@@ -113,6 +113,10 @@
 #include "conversation.h"
 #include "value.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**************************************************************************/
 /** @name GaimStatusPrimitive API                                         */
 /**************************************************************************/
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/stringref.c
--- a/libgaim/stringref.c	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/stringref.c	Tue Nov 07 20:40:22 2006 +0000
@@ -32,6 +32,27 @@
 #include "debug.h"
 #include "stringref.h"
 
+/**
+ * The internal representation of a stringref.
+ *
+ * @note For this structure to be useful, the string contained within
+ * it must be immutable -- for this reason, do _not_ access it
+ * directly!
+ */
+struct _GaimStringref {
+	guint32 ref;	/**< The reference count of this string.
+					 *   Note that reference counts are only
+					 *   31 bits, and the high-order bit
+					 *   indicates whether this string is up
+					 *   for GC at the next idle handler...
+					 *   But you aren't going to touch this
+					 *   anyway, right? */
+	char value[1];	/**< The string contained in this ref.
+					 *   Notice that it is simply "hanging
+					 *   off the end" of the ref ... this
+					 *   is to save an allocation. */
+};
+
 #define REFCOUNT(x) ((x) & 0x7fffffff)
 
 static GList *gclist = NULL;
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/stringref.h
--- a/libgaim/stringref.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/stringref.h	Tue Nov 07 20:40:22 2006 +0000
@@ -26,26 +26,11 @@
 #ifndef _GAIM_STRINGREF_H_
 #define _GAIM_STRINGREF_H_
 
-/**
- * The internal representation of a stringref.
- *
- * @note For this structure to be useful, the string contained within
- * it must be immutable -- for this reason, do _not_ access it
- * directly!
- */
-typedef struct _GaimStringref {
-	guint32 ref;	/**< The reference count of this string.
-					 *   Note that reference counts are only
-					 *   31 bits, and the high-order bit
-					 *   indicates whether this string is up
-					 *   for GC at the next idle handler...
-					 *   But you aren't going to touch this
-					 *   anyway, right? */
-	char value[1];	/**< The string contained in this ref.
-					 *   Notice that it is simply "hanging
-					 *   off the end" of the ref ... this
-					 *   is to save an allocation. */
-} GaimStringref;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _GaimStringref GaimStringref;
 
 /**
  * Creates an immutable reference-counted string object.  The newly
@@ -143,4 +128,8 @@
  */
 size_t gaim_stringref_len(const GaimStringref *stringref);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GAIM_STRINGREF_H_ */
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/stun.h
--- a/libgaim/stun.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/stun.h	Tue Nov 07 20:40:22 2006 +0000
@@ -25,6 +25,10 @@
 #ifndef _GAIM_STUN_H_
 #define _GAIM_STUN_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**************************************************************************/
 /** @name STUN API                                                        */
 /**************************************************************************/
@@ -76,4 +80,8 @@
 
 /*@}*/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GAIM_STUN_H_ */
diff -r 8d9a473bbab9 -r 500a8f54354e libgaim/xmlnode.h
--- a/libgaim/xmlnode.h	Tue Nov 07 19:54:02 2006 +0000
+++ b/libgaim/xmlnode.h	Tue Nov 07 20:40:22 2006 +0000
@@ -25,6 +25,10 @@
 #ifndef _GAIM_XMLNODE_H_
 #define _GAIM_XMLNODE_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * The valid types for an xmlnode
  */
@@ -224,4 +228,8 @@
  */
 void xmlnode_free(xmlnode *node);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GAIM_XMLNODE_H_ */