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>maint
							parent
							
								
									b5cc62f701
								
							
						
					
					
						commit
						adb7b5fc86
					
				|  | @ -10,8 +10,9 @@ | ||||||
|  |  | ||||||
| #include "git-compat-util.h" | #include "git-compat-util.h" | ||||||
| #include "delta.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>"; | 	"test-delta (-d|-p) <from_file> <data_file> <out_file>"; | ||||||
|  |  | ||||||
| int main(int argc, char *argv[]) | int main(int argc, char *argv[]) | ||||||
|  | @ -22,7 +23,7 @@ int main(int argc, char *argv[]) | ||||||
| 	unsigned long from_size, data_size, out_size; | 	unsigned long from_size, data_size, out_size; | ||||||
|  |  | ||||||
| 	if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) { | 	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; | 		return 1; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Martin Koegler
						Martin Koegler