Bug 710972 - Define G_VARIANT_TYPE_STRING_ARRAY when building against older glib. r=karlt
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 10 Jan 2012 09:12:23 +0100
changeset 85316 8ec9356640fd3c43bd262c394f1ca623582e4248
parent 85315 057e7ead186e1b232a88210fa6be3259fa3185cc
child 85317 d33ae35163056ca8b47e04bae72e75bae973dd07
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs710972
milestone12.0a1
Bug 710972 - Define G_VARIANT_TYPE_STRING_ARRAY when building against older glib. r=karlt
toolkit/system/gnome/nsGSettingsService.cpp
--- a/toolkit/system/gnome/nsGSettingsService.cpp
+++ b/toolkit/system/gnome/nsGSettingsService.cpp
@@ -57,16 +57,18 @@ typedef struct _GVariantType GVariantTyp
 typedef struct _GVariant GVariant;
 
 #ifndef G_VARIANT_TYPE_INT32
 # define G_VARIANT_TYPE_INT32        ((const GVariantType *) "i")
 # define G_VARIANT_TYPE_BOOLEAN      ((const GVariantType *) "b")
 # define G_VARIANT_TYPE_STRING       ((const GVariantType *) "s")
 # define G_VARIANT_TYPE_OBJECT_PATH  ((const GVariantType *) "o")
 # define G_VARIANT_TYPE_SIGNATURE    ((const GVariantType *) "g")
+#endif
+#ifndef G_VARIANT_TYPE_STRING_ARRAY
 # define G_VARIANT_TYPE_STRING_ARRAY ((const GVariantType *) "as")
 #endif
 
 #define GSETTINGS_FUNCTIONS \
   FUNC(g_settings_new, GSettings *, (const char* schema)) \
   FUNC(g_settings_list_schemas, const char * const *, (void)) \
   FUNC(g_settings_list_keys, char **, (GSettings* settings)) \
   FUNC(g_settings_get_value, GVariant *, (GSettings* settings, const char* key)) \