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.
This commit is contained in:
parent
3f4d223361
commit
de1ce843f1
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue