From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Date: Tue, 1 May 2007 09:47:55 +0000 (+0200)
Subject: Fix compilation of test-delta
X-Git-Tag: v1.5.2-rc2~7^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=adb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275;p=git.git

Fix compilation of test-delta

The code used write_in_full() without pulling its declarations from the
header file.  When header is included, usage[] collides with usage()
function.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/test-delta.c b/test-delta.c
index 16595ef0a..3d885ff37 100644
--- a/test-delta.c
+++ b/test-delta.c
@@ -10,8 +10,9 @@
 
 #include "git-compat-util.h"
 #include "delta.h"
+#include "cache.h"
 
-static const char usage[] =
+static const char usage_str[] =
 	"test-delta (-d|-p) <from_file> <data_file> <out_file>";
 
 int main(int argc, char *argv[])
@@ -22,7 +23,7 @@ int main(int argc, char *argv[])
 	unsigned long from_size, data_size, out_size;
 
 	if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
-		fprintf(stderr, "Usage: %s\n", usage);
+		fprintf(stderr, "Usage: %s\n", usage_str);
 		return 1;
 	}