[ostree] core: Drop old GLIB_CHECK_VERSION(2.32) bits
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] core: Drop old GLIB_CHECK_VERSION(2.32) bits
- Date: Sun, 18 Nov 2012 20:45:06 +0000 (UTC)
commit de1ce843f13a4c3fd201305785161f46946d8a32
Author: Colin Walters <walters verbum org>
Date: Sun Nov 18 15:44:21 2012 -0500
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, 0 insertions(+), 10 deletions(-)
---
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 7555be7..bbd25db 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 973dbf1..21349ae 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
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]