diff --git a/ChangeLog b/ChangeLog index 6c5cb25fa..b6bf49ef0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-04-03 Matthias Clasen + + * glib/gutils.h: Undef G_CAN_INLINE if G_IMPLEMENT_INLINES is + defined. This was the pre-2.6 behaviour, and without it, + G_IMPLEMENT_INLINES cannot be used in multiple .c files + at all. (#165852, Dave Benson) + 2005-04-01 Matthias Clasen * glib/gmain.c (g_child_watch_source_new): Add a note regarding diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6c5cb25fa..b6bf49ef0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-04-03 Matthias Clasen + + * glib/gutils.h: Undef G_CAN_INLINE if G_IMPLEMENT_INLINES is + defined. This was the pre-2.6 behaviour, and without it, + G_IMPLEMENT_INLINES cannot be used in multiple .c files + at all. (#165852, Dave Benson) + 2005-04-01 Matthias Clasen * glib/gmain.c (g_child_watch_source_new): Add a note regarding diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 6c5cb25fa..b6bf49ef0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2005-04-03 Matthias Clasen + + * glib/gutils.h: Undef G_CAN_INLINE if G_IMPLEMENT_INLINES is + defined. This was the pre-2.6 behaviour, and without it, + G_IMPLEMENT_INLINES cannot be used in multiple .c files + at all. (#165852, Dave Benson) + 2005-04-01 Matthias Clasen * glib/gmain.c (g_child_watch_source_new): Add a note regarding diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6c5cb25fa..b6bf49ef0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-04-03 Matthias Clasen + + * glib/gutils.h: Undef G_CAN_INLINE if G_IMPLEMENT_INLINES is + defined. This was the pre-2.6 behaviour, and without it, + G_IMPLEMENT_INLINES cannot be used in multiple .c files + at all. (#165852, Dave Benson) + 2005-04-01 Matthias Clasen * glib/gmain.c (g_child_watch_source_new): Add a note regarding diff --git a/glib/gutils.h b/glib/gutils.h index f2e483bee..5ba1ad883 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -94,6 +94,7 @@ G_BEGIN_DECLS #endif #ifdef G_IMPLEMENT_INLINES # define G_INLINE_FUNC +# undef G_CAN_INLINE #elif defined (__GNUC__) # define G_INLINE_FUNC extern inline #elif defined (G_CAN_INLINE)