From 0bf9bc065c86f8c2b986d8688a671bcb7095f445 Mon Sep 17 00:00:00 2001 From: Matthias Clasen <mclasen@redhat.com> Date: Wed, 5 Jan 2005 20:10:57 +0000 Subject: [PATCH] Simplify the inlining magic to make it work at Oh zero. (#162990, Kalpesh 2005-01-05 Matthias Clasen <mclasen@redhat.com> * glib/gutils.h: Simplify the inlining magic to make it work at Oh zero. (#162990, Kalpesh Shah) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutils.h | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1085b2754..78b60243b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gutils.h: Simplify the inlining magic to make it + work at Oh zero. (#162990, Kalpesh Shah) + 2005-01-04 Tor Lillqvist <tml@iki.fi> * glib/guniprop.c (get_locale_type): Use g_win32_getlocale() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1085b2754..78b60243b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gutils.h: Simplify the inlining magic to make it + work at Oh zero. (#162990, Kalpesh Shah) + 2005-01-04 Tor Lillqvist <tml@iki.fi> * glib/guniprop.c (get_locale_type): Use g_win32_getlocale() diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1085b2754..78b60243b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gutils.h: Simplify the inlining magic to make it + work at Oh zero. (#162990, Kalpesh Shah) + 2005-01-04 Tor Lillqvist <tml@iki.fi> * glib/guniprop.c (get_locale_type): Use g_win32_getlocale() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1085b2754..78b60243b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gutils.h: Simplify the inlining magic to make it + work at Oh zero. (#162990, Kalpesh Shah) + 2005-01-04 Tor Lillqvist <tml@iki.fi> * glib/guniprop.c (get_locale_type): Use g_win32_getlocale() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1085b2754..78b60243b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gutils.h: Simplify the inlining magic to make it + work at Oh zero. (#162990, Kalpesh Shah) + 2005-01-04 Tor Lillqvist <tml@iki.fi> * glib/guniprop.c (get_locale_type): Use g_win32_getlocale() diff --git a/glib/gutils.h b/glib/gutils.h index c9966739d..08634c4d6 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -94,9 +94,9 @@ G_BEGIN_DECLS #endif #ifdef G_IMPLEMENT_INLINES # define G_INLINE_FUNC -#elif defined (__GNUC__) && defined (__OPTIMIZE__) +#elif defined (__GNUC__) # define G_INLINE_FUNC extern inline -#elif defined (G_CAN_INLINE) && !defined (__GNUC__) +#elif defined (G_CAN_INLINE) # define G_INLINE_FUNC static inline #else /* can't inline */ # define G_INLINE_FUNC