Merge branch 'glib-removal-hack'

Fix obvious merge issue in Rules.mk

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/file.h b/file.h
index 38f7b496e..b3a1ebac3 100644
--- a/file.h
+++ b/file.h
@@ -6,7 +6,9 @@ struct memblock {
 	size_t size;
 };
 
+#if 0
 extern int try_to_open_cochran(const char *filename, struct memblock *mem, GError **error);
+#endif
 extern int readfile(const char *filename, struct memblock *mem);
 
 #endif