Merge git://repo.or.cz/git-gui

diff --git a/interpolate.h b/interpolate.h
index d16f9244f3de25ec9e554c6d9f5bae07de7bf2a0..77407e67dca97eb85274c69e2e7469e1d4d40b3b 100644 (file)
--- a/interpolate.h
+++ b/interpolate.h
@@ -12,12 +12,15 @@
  */
 
 struct interp {
-       char *name;
+       const char *name;
        char *value;
 };
 
-extern int interpolate(char *result, int reslen,
-                      const char *orig,
-                      const struct interp *interps, int ninterps);
+extern void interp_set_entry(struct interp *table, int slot, const char *value);
+extern void interp_clear_table(struct interp *table, int ninterps);
+
+extern unsigned long interpolate(char *result, unsigned long reslen,
+                                const char *orig,
+                                const struct interp *interps, int ninterps);
 
 #endif /* INTERPOLATE_H */