summaryrefslogtreecommitdiff
path: root/glib/gutils.h
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-04-04 03:45:13 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-04-04 03:45:13 +0000
commitb73f494fab6efc2dd9f49c166ddf96496016113d (patch)
tree089e98ef8c4fb2208d84a8d2e8169fbc8bbf4d70 /glib/gutils.h
parent0914ea84e3c7a48fa59f686c4182787df3fe5320 (diff)
downloadglib-b73f494fab6efc2dd9f49c166ddf96496016113d.tar.gz
Undef G_CAN_INLINE if G_IMPLEMENT_INLINES is defined. This was the pre-2.6
2005-04-03 Matthias Clasen <mclasen@redhat.com> * 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)
Diffstat (limited to 'glib/gutils.h')
-rw-r--r--glib/gutils.h1
1 files changed, 1 insertions, 0 deletions
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)