diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2018-05-28 09:00:14 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-05-28 09:00:14 +0000 |
| commit | 2548ea7f6665e40aed949c133906717d00f326cf (patch) | |
| tree | e2b42c23585c6bb38ef639506ad7d8373dfcae5d | |
| parent | ef4d960d2c4ef60f222c6d172148648b17840192 (diff) | |
| parent | 4227770af64dd7ea80aa25c9a71f00e697dca591 (diff) | |
| download | glib-2548ea7f6665e40aed949c133906717d00f326cf.tar.gz | |
Merge branch 'lrn/issue-1240' into 'master'
W32: Make _g_win32_get_system_data_dirs() inline available in C++
Closes #1240
See merge request GNOME/glib!28
| -rw-r--r-- | glib/gutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/gutils.h b/glib/gutils.h index 333e2c5a4..84c0f4f20 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -83,7 +83,7 @@ GLIB_AVAILABLE_IN_ALL const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void)); #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 * 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. |