From de1ce843f13a4c3fd201305785161f46946d8a32 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 18 Nov 2012 15:44:21 -0500 Subject: [PATCH] core: Drop old GLIB_CHECK_VERSION(2.32) bits We hard require 2.34 now; if it doesn't exist on the system, that's what embedded dependencies are for. --- src/libostree/ostree-repo.c | 4 ---- src/libotutil/ot-variant-utils.c | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 7555be7d..bbd25dbe 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -54,11 +54,7 @@ struct OstreeRepo { GFile *remote_cache_dir; GFile *config_file; -#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN) GMutex cache_lock; -#else - GMutex *cache_lock; -#endif GPtrArray *cached_meta_indexes; GPtrArray *cached_content_indexes; diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c index 973dbf16..21349aea 100644 --- a/src/libotutil/ot-variant-utils.c +++ b/src/libotutil/ot-variant-utils.c @@ -92,13 +92,7 @@ ot_util_variant_save (GFile *dest, GVariant * ot_util_variant_take_ref (GVariant *variant) { -#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN) return g_variant_take_ref (variant); -#else - if (g_variant_is_floating (variant)) - return g_variant_ref_sink (variant); - return variant; -#endif } /**