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)
This commit is contained in:
Tor Lillqvist 2005-07-20 08:37:13 +00:00 committed by Tor Lillqvist
parent 912e4ea3cb
commit f0a0fe7a44
5 changed files with 28 additions and 1 deletions

View File

@ -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> 2005-07-19 Matthias Clasen <mclasen@redhat.com>
* glib/gstring.c (g_string_chunk_insert_len): Avoid * glib/gstring.c (g_string_chunk_insert_len): Avoid

View File

@ -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> 2005-07-19 Matthias Clasen <mclasen@redhat.com>
* glib/gstring.c (g_string_chunk_insert_len): Avoid * glib/gstring.c (g_string_chunk_insert_len): Avoid

View File

@ -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> 2005-07-19 Matthias Clasen <mclasen@redhat.com>
* glib/gstring.c (g_string_chunk_insert_len): Avoid * glib/gstring.c (g_string_chunk_insert_len): Avoid

View File

@ -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> 2005-07-19 Matthias Clasen <mclasen@redhat.com>
* glib/gstring.c (g_string_chunk_insert_len): Avoid * glib/gstring.c (g_string_chunk_insert_len): Avoid

View File

@ -130,7 +130,10 @@ G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs (void);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (gconstpointer address); 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) g_win32_get_system_data_dirs (void)
{ {
return g_win32_get_system_data_dirs_for_module ((gconstpointer) &g_win32_get_system_data_dirs); return g_win32_get_system_data_dirs_for_module ((gconstpointer) &g_win32_get_system_data_dirs);