Merge branch 'lrn/issue-1240_glib-2-56' into 'glib-2-56'

W32: Make _g_win32_get_system_data_dirs() inline available in C++ (glib-2-56 backport)

See merge request GNOME/glib!29
This commit is contained in:
Philip Withnall 2018-05-28 08:58:46 +00:00
commit 69dec2db49

View File

@ -83,7 +83,7 @@ GLIB_AVAILABLE_IN_ALL
const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void)); const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
#endif #endif
#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus) #if defined (G_OS_WIN32) && defined (G_CAN_INLINE)
/* This function is not part of the public GLib API either. Just call /* This function is not part of the public GLib API either. Just call
* g_get_system_data_dirs() in your code, never mind that that is * g_get_system_data_dirs() in your code, never mind that that is
* actually a macro and you will in fact call this inline function. * actually a macro and you will in fact call this inline function.