Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/oscar/oscar.h	Thu Dec 13 16:11:47 2018 -0600
+++ b/libpurple/protocols/oscar/oscar.h	Sat Dec 15 06:00:16 2018 +0000
@@ -75,9 +75,7 @@
 
 #include "snactypes.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define FAIM_SNAC_HASH_SIZE 16
 
@@ -1375,8 +1373,6 @@
 
 void oscar_init_account_options(PurpleProtocol *protocol, gboolean is_icq);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _OSCAR_H_ */

--- a/libpurple/version.h.in	Thu Dec 13 16:11:47 2018 -0600
+++ b/libpurple/version.h.in	Sat Dec 15 06:00:16 2018 +0000
@@ -54,9 +54,7 @@
 									 ((y) < PURPLE_MINOR_VERSION || \
 									  ((y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION)))
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**
  * purple_version_check:
@@ -99,9 +97,7 @@
  */
 extern const guint purple_micro_version;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PURPLE_VERSION_H_ */
 

--- a/libpurple/win32/libc_interface.h	Thu Dec 13 16:11:47 2018 -0600
+++ b/libpurple/win32/libc_interface.h	Sat Dec 15 06:00:16 2018 +0000
@@ -33,9 +33,7 @@
 #include <glib.h>
 #include "glibcompat.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #ifdef _MSC_VER
 #define S_IRUSR S_IREAD
@@ -156,8 +154,6 @@
 #define localtime_r( time, resultp ) \
 wpurple_localtime_r( time, resultp )
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _LIBC_INTERFACE_H_ */

--- a/libpurple/win32/libc_internal.h	Thu Dec 13 16:11:47 2018 -0600
+++ b/libpurple/win32/libc_internal.h	Sat Dec 15 06:00:16 2018 +0000
@@ -24,10 +24,7 @@
 #define _LIBC_INTERNAL_
 #include <glib.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* sys/socket.h */
 int wpurple_socket(int domain, int style, int protocol);
@@ -114,9 +111,6 @@
 int wpurple_close(int fd);
 int wpurple_gethostname(char *name, size_t size);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _LIBC_INTERNAL_ */

--- a/libpurple/win32/win32dep.h	Thu Dec 13 16:11:47 2018 -0600
+++ b/libpurple/win32/win32dep.h	Sat Dec 15 06:00:16 2018 +0000
@@ -32,10 +32,7 @@
 #include "wpurpleerror.h"
 #include "libc_interface.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* the winapi headers don't yet have winhttp.h, so we use the struct from msdn directly */
 typedef struct {
@@ -79,9 +76,7 @@
 void wpurple_init(void);
 void wpurple_cleanup(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _WIN32DEP_H_ */
 

--- a/pidgin/plugins/ticker/gtkticker.h	Thu Dec 13 16:11:47 2018 -0600
+++ b/pidgin/plugins/ticker/gtkticker.h	Sat Dec 15 06:00:16 2018 +0000
@@ -30,9 +30,7 @@
 
 #include "plugins.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TICKER            (gtk_ticker_get_type())
 #define GTK_TICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_TICKER, GtkTicker))
@@ -94,9 +92,6 @@
 void       gtk_ticker_start_scroll     (GtkTicker       *ticker);
 void       gtk_ticker_stop_scroll      (GtkTicker       *ticker);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TICKER_H__ */

--- a/pidgin/win32/untar.h	Thu Dec 13 16:11:47 2018 -0600
+++ b/pidgin/win32/untar.h	Sat Dec 15 06:00:16 2018 +0000
@@ -8,9 +8,7 @@
 #ifndef _UNTAR_H_
 #define _UNTAR_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	UNTAR_LISTING =      (1 << 0),
@@ -23,8 +21,6 @@
 
 int untar(const char *filename, const char *destdir, untar_opt options);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif