diff libpurple/stun.h @ 32819:2c6510167895 default tip

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents 98520ee78f12
children
line wrap: on
line diff
--- a/libpurple/stun.h	Sat Jun 02 02:30:13 2012 +0000
+++ b/libpurple/stun.h	Sat Jun 02 02:30:49 2012 +0000
@@ -26,10 +26,6 @@
 #ifndef _PURPLE_STUN_H_
 #define _PURPLE_STUN_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**************************************************************************/
 /** @name STUN API                                                        */
 /**************************************************************************/
@@ -63,6 +59,8 @@
 
 typedef void (*StunCallback) (PurpleStunNatDiscovery *);
 
+G_BEGIN_DECLS
+
 /**
  * Starts a NAT discovery. It returns a PurpleStunNatDiscovery if the discovery
  * is already done. Otherwise the callback is called when the discovery is over
@@ -81,8 +79,6 @@
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PURPLE_STUN_H_ */