[glib] gnextstepsettingsbackend: Use same token for function-call and its availability



commit b413f7a285f597e4bcbb8866fcb22bea661fcdcd
Author: Daniel Macks <dmacks netspace org>
Date:   Mon Jun 9 15:17:19 2014 -0400

    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

 gio/giomodule.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 043ec19..510f652 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -1072,7 +1072,7 @@ _g_io_modules_ensure_loaded (void)
       g_type_ensure (g_win32_directory_monitor_get_type ());
       g_type_ensure (g_registry_backend_get_type ());
 #endif
-#ifdef HAVE_CARBON
+#ifdef HAVE_COCOA
       g_nextstep_settings_backend_get_type ();
 #endif
 #ifdef G_OS_UNIX


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]