Commit cba60b9b0ef90ab2b69e5015627c7daa613dfda3

Edward Thomson 2016-08-05T09:10:58

Merge pull request #3884 from pks-t/pks/patch-image-initialization Patch image initialization

diff --git a/src/apply.c b/src/apply.c
index 40ba647..10bf1f4 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -38,7 +38,7 @@ static void patch_line_init(
 	out->content_offset = in_offset;
 }
 
-#define PATCH_IMAGE_INIT { {0} }
+#define PATCH_IMAGE_INIT { GIT_POOL_INIT, GIT_VECTOR_INIT }
 
 static int patch_image_init_fromstr(
 	patch_image *out, const char *in, size_t in_len)
diff --git a/src/pool.h b/src/pool.h
index e0fafa9..f61f169 100644
--- a/src/pool.h
+++ b/src/pool.h
@@ -35,6 +35,8 @@ typedef struct {
 	uint32_t page_size;  /* size of page in bytes */
 } git_pool;
 
+#define GIT_POOL_INIT { NULL, 0, 0 }
+
 #else
 
 /**
@@ -57,6 +59,9 @@ typedef struct {
 	uint32_t item_size;
 	uint32_t page_size;
 } git_pool;
+
+#define GIT_POOL_INIT { GIT_VECTOR_INIT, 0, 0 }
+
 #endif
 
 /**