Permalink
Browse files

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>
  • Loading branch information...
1 parent b5cc62f commit adb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275 Martin Koegler committed with Junio C Hamano May 1, 2007
Showing with 3 additions and 2 deletions.
  1. +3 −2 test-delta.c
View
@@ -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;
}

0 comments on commit adb7b5f

Please sign in to comment.