Mercurial > pidgin

diff libpurple/circbuffer.h @ 32743:8404c5b75e99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 09d2e29b6ff4dcc675099f74645ca2eb119ad6b5) to branch 'im.pidgin.pidgin' (head 607e111e6c0089eb2b27a1046427c3688ee4424b)
author Mark Doliner <mark@kingant.net>
date Sat, 10 Mar 2012 05:27:17 +0000
parents 98520ee78f12
children
line wrap: on
line diff
--- a/libpurple/circbuffer.h	Sat Mar 10 05:25:00 2012 +0000
+++ b/libpurple/circbuffer.h	Sat Mar 10 05:27:17 2012 +0000
@@ -26,10 +26,6 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct _PurpleCircBuffer {
 
 	/** A pointer to the starting address of our chunk of memory. */
@@ -55,6 +51,8 @@
 
 } PurpleCircBuffer;
 
+G_BEGIN_DECLS
+
 /**
  * Creates a new circular buffer.  This will not allocate any memory for the
  * actual buffer until data is appended to it.
@@ -111,8 +109,6 @@
  */
 gboolean purple_circ_buffer_mark_read(PurpleCircBuffer *buf, gsize len);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _CIRCBUFFER_H */