Sync with 2.19.2

diff --git a/line-range.h b/line-range.h
index d3c54e45aa8a8e488778bbc7db1c6a5c0f602ab2..e69bf7c01765bba0b54a7a4174706f1258e0fdb0 100644 (file)
--- a/line-range.h
+++ b/line-range.h
@@ -1,6 +1,8 @@
 #ifndef LINE_RANGE_H
 #define LINE_RANGE_H
 
+struct index_state;
+
 /*
  * Parse one item in an -L begin,end option w.r.t. the notional file
  * object 'cb_data' consisting of 'lines' lines.
@@ -23,7 +25,7 @@ int parse_range_arg(const char *arg,
                    nth_line_fn_t nth_line_cb,
                    void *cb_data, long lines, long anchor,
                    long *begin, long *end,
-                   const char *path);
+                   const char *path, struct index_state *istate);
 
 /*
  * Scan past a range argument that could be parsed by
@@ -34,6 +36,6 @@ int parse_range_arg(const char *arg,
  * NULL in case the argument is obviously malformed.
  */
 
-const char *skip_range_arg(const char *arg);
+const char *skip_range_arg(const char *arg, struct index_state *istate);
 
 #endif /* LINE_RANGE_H */