Make this an inline function. Define it only if G_CAN_INLINE and not C++.

2005-07-20  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.h (g_win32_get_system_data_dirs): Make this an
	inline function. Define it only if G_CAN_INLINE and not
	C++. (#173098)

diff --git a/ChangeLog b/ChangeLog
index 8fb09ee..af2cbec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-20  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.h (g_win32_get_system_data_dirs): Make this an
+       inline function. Define it only if G_CAN_INLINE and not
+       C++. (#173098)
+
 2005-07-19  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstring.c (g_string_chunk_insert_len): Avoid

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8fb09ee..af2cbec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-20  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.h (g_win32_get_system_data_dirs): Make this an
+       inline function. Define it only if G_CAN_INLINE and not
+       C++. (#173098)
+
 2005-07-19  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstring.c (g_string_chunk_insert_len): Avoid

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8fb09ee..af2cbec 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-07-20  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.h (g_win32_get_system_data_dirs): Make this an
+       inline function. Define it only if G_CAN_INLINE and not
+       C++. (#173098)
+
 2005-07-19  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstring.c (g_string_chunk_insert_len): Avoid

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8fb09ee..af2cbec 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-20  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.h (g_win32_get_system_data_dirs): Make this an
+       inline function. Define it only if G_CAN_INLINE and not
+       C++. (#173098)
+
 2005-07-19  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstring.c (g_string_chunk_insert_len): Avoid

diff --git a/glib/gutils.h b/glib/gutils.h
index 079a86c..3cb781f 100644 (file)
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -130,7 +130,10 @@ G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs   (void);
 
 #ifdef G_OS_WIN32
 G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (gconstpointer address);
-static G_CONST_RETURN gchar * G_CONST_RETURN *
+#endif
+
+#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
+static inline G_CONST_RETURN gchar * G_CONST_RETURN *
 g_win32_get_system_data_dirs (void)
 {
   return g_win32_get_system_data_dirs_for_module ((gconstpointer) &g_win32_get_system_data_dirs);