--- a/libpurple/upnp.h	Tue Jan 03 19:29:43 2012 +0000
+++ b/libpurple/upnp.h	Tue Jan 03 23:32:59 2012 +0000
@@ -29,9 +29,7 @@
 
 typedef struct _UPnPMappingAddRemove UPnPMappingAddRemove;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**************************************************************************/
 /** @name UPnP API                                                        */
@@ -125,8 +123,6 @@
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PURPLE_UPNP_H_ */