Always define G_CAN_INLINE. Even MSVC6 is capable of inlining. (#483337,

2007-10-04  Tor Lillqvist  <tml@novell.com>

	* glibconfig.h.win32.in: Always define G_CAN_INLINE. Even MSVC6 is
	capable of inlining. (#483337, Steve Lhomme)

svn path=/trunk/; revision=5780

diff --git a/ChangeLog b/ChangeLog
index 9ce371f168642751647c78f9629f215cf1c4975c..63cab61e9eb902d918fe97ecac40e7b87b21c577 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-04  Tor Lillqvist  <tml@novell.com>
+
+       * glibconfig.h.win32.in: Always define G_CAN_INLINE. Even MSVC6 is
+       capable of inlining. (#483337, Steve Lhomme)
+
 2007-09-19  Behdad Esfahbod  <behdad@gnome.org>
 
        * glib/ghook.c (g_hook_free): Check for NULL finalizer. (#476849, Areg

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index afe4714926e49749242a276181c17dea7698b279..7d6c34526b844be614feaf4305b15e9e957138e3 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -120,9 +120,7 @@ typedef gint64 goffset;
 #endif /* !_MSC_VER and !__DMC__ */
 #endif /* !__cplusplus */
 
-#if defined(__cplusplus) || !defined(_MSC_VER)
 #define G_CAN_INLINE   1
-#endif
 
 #ifndef _MSC_VER
 #define G_HAVE_ISO_VARARGS 1