Code

Fix compilation of test-delta
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>
Tue, 1 May 2007 09:47:55 +0000 (11:47 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 1 May 2007 09:59:08 +0000 (02:59 -0700)
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>
test-delta.c

index 16595ef0a9022b1a9c677a36205526eb3567a93d..3d885ff37ee7fc43dec05dd827679d68cee5516b 100644 (file)
@@ -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;
        }