Small cleanup (use G_BEGIN/END_DECLS). (#168474, Fabricio Barros Cabral)

2005-03-07  Matthias Clasen  <mclasen@redhat.com>

	* glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS).
	(#168474, Fabricio Barros Cabral)

diff --git a/ChangeLog b/ChangeLog
index 8d4cfec10fa59efd326b6c889c4f0d7c10d0d178..b94c653cb36b7d0465a29511feedfba2c2e4598e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS).
+       (#168474, Fabricio Barros Cabral)
+
 2005-03-07  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_find_program_in_path): Mark the last

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8d4cfec10fa59efd326b6c889c4f0d7c10d0d178..b94c653cb36b7d0465a29511feedfba2c2e4598e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-03-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS).
+       (#168474, Fabricio Barros Cabral)
+
 2005-03-07  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_find_program_in_path): Mark the last

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8d4cfec10fa59efd326b6c889c4f0d7c10d0d178..b94c653cb36b7d0465a29511feedfba2c2e4598e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-03-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS).
+       (#168474, Fabricio Barros Cabral)
+
 2005-03-07  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_find_program_in_path): Mark the last

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8d4cfec10fa59efd326b6c889c4f0d7c10d0d178..b94c653cb36b7d0465a29511feedfba2c2e4598e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-03-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS).
+       (#168474, Fabricio Barros Cabral)
+
 2005-03-07  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.c (g_find_program_in_path): Mark the last

diff --git a/glib/gdebug.h b/glib/gdebug.h
index a77e29442212f3ed492dc575f022e3307a1f0f12..67a8af8e87bcb53f5244819da10eb8279e063b1f 100644 (file)
--- a/glib/gdebug.h
+++ b/glib/gdebug.h
@@ -27,9 +27,7 @@
 #ifndef __G_DEBUG_H__
 #define __G_DEBUG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS 
 
 typedef enum {
   G_DEBUG_FATAL_WARNINGS = 1 << 0
@@ -55,9 +53,6 @@ GLIB_VAR guint _g_debug_flags;
 
 void _g_debug_init (void) G_GNUC_INTERNAL;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __G_DEBUG_H__ */

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index cc8f0801f8bf3ddb78b527f26f137ec9fc7a8ac4..47aaf02dbd0ea8d38ca429bb091939864ed9a4ef 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gvaluearray.h: Small cleanup (use G_BEGIN/END_DECLS).
+       (#168474, Fabricio Barros Cabral)
+
 2005-02-24  Tor Lillqvist  <tml@novell.com>
 
        * Makefile.am (EXTRA_DIST): Don't distribute

diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index b822895c262037e83842188dd7636e0814e570de..d6897148fb08cebac3174020d70a340f5c422f0c 100644 (file)
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -28,9 +28,7 @@
 #include       <gobject/gvalue.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 /* --- typedefs & structs --- */
@@ -67,9 +65,6 @@ GValueArray*  g_value_array_sort_with_data (GValueArray       *value_array,
                                              gpointer           user_data);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __G_VALUE_ARRAY_H__ */