From 959db9f0deb49d3ec896419a0ea358df1a799d0b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 27 Apr 2014 16:32:17 -0400
Subject: [PATCH] core: Add _STRING variants of GVariant object formats

For the static deltas work, we're going to embed a commit in the delta
superblock, so we need a format string without the G_VARIANT_TYPE().
---
 src/libostree/ostree-core.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index de1698d2..ced4ff4b 100644
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -80,7 +80,8 @@ typedef enum {
  * u - mode
  * a(ayay) - xattrs
  */
-#define OSTREE_DIRMETA_GVARIANT_FORMAT G_VARIANT_TYPE ("(uuua(ayay))")
+#define OSTREE_DIRMETA_GVARIANT_STRING "(uuua(ayay))"
+#define OSTREE_DIRMETA_GVARIANT_FORMAT G_VARIANT_TYPE (OSTREE_DIRMETA_GVARIANT_STRING)
 
 /**
  * OSTREE_TREE_GVARIANT_FORMAT:
@@ -88,7 +89,8 @@ typedef enum {
  * a(say) - array of (filename, checksum) for files
  * a(sayay) - array of (dirname, tree_checksum, meta_checksum) for directories
  */
-#define OSTREE_TREE_GVARIANT_FORMAT G_VARIANT_TYPE ("(a(say)a(sayay))")
+#define OSTREE_TREE_GVARIANT_STRING "(a(say)a(sayay))"
+#define OSTREE_TREE_GVARIANT_FORMAT G_VARIANT_TYPE (OSTREE_TREE_GVARIANT_STRING)
 
 /**
  * OSTREE_COMMIT_GVARIANT_FORMAT:
@@ -102,7 +104,8 @@ typedef enum {
  * ay - Root tree contents
  * ay - Root tree metadata
  */
-#define OSTREE_COMMIT_GVARIANT_FORMAT G_VARIANT_TYPE ("(a{sv}aya(say)sstayay)")
+#define OSTREE_COMMIT_GVARIANT_STRING "(a{sv}aya(say)sstayay)"
+#define OSTREE_COMMIT_GVARIANT_FORMAT G_VARIANT_TYPE (OSTREE_COMMIT_GVARIANT_STRING)
 
 /**
  * OstreeRepoMode: