Merge branch 'jc/no-slim-shell'

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index fa68c651424e406ce84c890a655a5e292a7e5af6..1b045669ae05519a9f2023e5ccdfa4f75f2c7f29 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -12,8 +12,7 @@
 #define CHILD_SHOWN    (1u<<6)
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
 #define SYMMETRIC_LEFT (1u<<8)
-#define TOPOSORT       (1u<<9) /* In the active toposort list.. */
-#define ALL_REV_FLAGS  ((1u<<10)-1)
+#define ALL_REV_FLAGS  ((1u<<9)-1)
 
 struct rev_info;
 struct log_info;
@@ -120,7 +119,7 @@ struct rev_info {
 void read_revisions_from_stdin(struct rev_info *revs);
 
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
-volatile show_early_output_fn_t show_early_output;
+extern volatile show_early_output_fn_t show_early_output;
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);