mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-13 07:56:17 +01:00
gnextstepsettingsbackend: Use same token for function-call and its availability
Availability of the g_nextstep_settings_backend_get_type() prototype is controlled by HAVE_COCOA in gsettingsbackendinternal.h and the actual implemenation by OS_COCOA in Makefile.am. Therefore, the giomodule.c call to that function should also be protected by a COCOA token rather than an CARBON token (cocoa and carbon are independent autoconf tests). https://bugzilla.gnome.org/show_bug.cgi?id=731425
This commit is contained in:
parent
93d0c63232
commit
b413f7a285
@ -1072,7 +1072,7 @@ _g_io_modules_ensure_loaded (void)
|
|||||||
g_type_ensure (g_win32_directory_monitor_get_type ());
|
g_type_ensure (g_win32_directory_monitor_get_type ());
|
||||||
g_type_ensure (g_registry_backend_get_type ());
|
g_type_ensure (g_registry_backend_get_type ());
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_CARBON
|
#ifdef HAVE_COCOA
|
||||||
g_nextstep_settings_backend_get_type ();
|
g_nextstep_settings_backend_get_type ();
|
||||||
#endif
|
#endif
|
||||||
#ifdef G_OS_UNIX
|
#ifdef G_OS_UNIX
|
||||||
|
Loading…
Reference in New Issue
Block a user