X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=b8f1fdecf4d9e5e8f8e834eb55a374f1af8352fd;hb=b3f01ff29f7131e959bcfdfd004744d74d5fa319;hp=05ebc115a13df5c1b80128489619d753ed107a6f;hpb=16bfbe6352e90b87de26effe5ce120ab74ebafc7;p=git.git

diff --git a/diffcore.h b/diffcore.h
index 05ebc115a..b8f1fdecf 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -91,13 +91,11 @@ struct diff_queue_struct {
 	struct diff_filepair **queue;
 	int alloc;
 	int nr;
-	int run;
 };
 #define DIFF_QUEUE_CLEAR(q) \
 	do { \
 		(q)->queue = NULL; \
 		(q)->nr = (q)->alloc = 0; \
-		(q)->run = 0; \
 	} while (0)
 
 extern struct diff_queue_struct diff_queued_diff;
@@ -109,7 +107,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
 extern void diffcore_break(int);
 extern void diffcore_rename(struct diff_options *);
 extern void diffcore_merge_broken(void);
-extern void diffcore_pickaxe(const char *needle, int opts);
+extern void diffcore_pickaxe(struct diff_options *);
 extern void diffcore_order(const char *orderfile);
 
 #define DIFF_DEBUG 0