From 20967643a3bf596aa63e78152a621a5233dd87e0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Mar 2005 05:15:57 +0000 Subject: [PATCH] Small cleanup (use G_BEGIN/END_DECLS). (#168474, Fabricio Barros Cabral) 2005-03-07 Matthias Clasen * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS). (#168474, Fabricio Barros Cabral) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gdebug.h | 9 ++------- gobject/ChangeLog | 5 +++++ gobject/gvaluearray.h | 9 ++------- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d4cfec1..b94c653c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-07 Matthias Clasen + + * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS). + (#168474, Fabricio Barros Cabral) + 2005-03-07 Matthias Clasen * glib/gutils.c (g_find_program_in_path): Mark the last diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8d4cfec1..b94c653c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-03-07 Matthias Clasen + + * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS). + (#168474, Fabricio Barros Cabral) + 2005-03-07 Matthias Clasen * glib/gutils.c (g_find_program_in_path): Mark the last diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8d4cfec1..b94c653c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-03-07 Matthias Clasen + + * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS). + (#168474, Fabricio Barros Cabral) + 2005-03-07 Matthias Clasen * glib/gutils.c (g_find_program_in_path): Mark the last diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8d4cfec1..b94c653c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-03-07 Matthias Clasen + + * glib/gdebug.h: Small cleanup (use G_BEGIN/END_DECLS). + (#168474, Fabricio Barros Cabral) + 2005-03-07 Matthias Clasen * glib/gutils.c (g_find_program_in_path): Mark the last diff --git a/glib/gdebug.h b/glib/gdebug.h index a77e2944..67a8af8e 100644 --- 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 cc8f0801..47aaf02d 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2005-03-08 Matthias Clasen + + * gvaluearray.h: Small cleanup (use G_BEGIN/END_DECLS). + (#168474, Fabricio Barros Cabral) + 2005-02-24 Tor Lillqvist * Makefile.am (EXTRA_DIST): Don't distribute diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h index b822895c..d6897148 100644 --- a/gobject/gvaluearray.h +++ b/gobject/gvaluearray.h @@ -28,9 +28,7 @@ #include -#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__ */ -- 2.34.1