From 3812559659e645be223e34f12040c2d58fdc875c Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 3 Feb 2011 17:26:51 -0500
Subject: [PATCH 1/2] Remove unused variable in gvdb-reader

As originally committed against dconf by Owen.

Newer GCC flags this.
---
 gvdb-reader.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gvdb-reader.c b/gvdb-reader.c
index 264e87d15..73f4f1385 100644
--- a/gvdb-reader.c
+++ b/gvdb-reader.c
@@ -87,7 +87,6 @@ gvdb_table_setup_root (GvdbTable                 *file,
 {
   const struct gvdb_hash_header *header;
   guint32 n_bloom_words;
-  guint32 bloom_shift;
   guint32 n_buckets;
   gsize size;
 
@@ -100,7 +99,6 @@ gvdb_table_setup_root (GvdbTable                 *file,
 
   n_bloom_words = guint32_from_le (header->n_bloom_words);
   n_buckets = guint32_from_le (header->n_buckets);
-  bloom_shift = n_bloom_words >> 27;
   n_bloom_words &= (1u << 27) - 1;
 
   if G_UNLIKELY (n_bloom_words * sizeof (guint32_le) > size)

From a5dd6fcc4f46a322cc547a5fcfa1b52cbc5ec6d6 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 15 Apr 2011 09:27:38 -0400
Subject: [PATCH 2/2] builder: do not include <unistd.h> on win32

Spotted by Kean Johnston <kean.johnston@gmail.com>.

https://mail.gnome.org/archives/gtk-devel-list/2011-April/msg00010.html
---
 gvdb-builder.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gvdb-builder.c b/gvdb-builder.c
index 4b48d804e..f65ca7dbd 100644
--- a/gvdb-builder.c
+++ b/gvdb-builder.c
@@ -24,7 +24,9 @@
 
 #include <glib.h>
 #include <fcntl.h>
+#if !defined(G_OS_WIN32) || !defined(_MSC_VER)
 #include <unistd.h>
+#endif
 #include <string.h>