Merge branch 'maint'

diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h
index 05cf97f3a7854e3ddf7060b361278ca82adc844b..33a8fe996f5fc025f587c1d09ae3f81e1786dbbb 100644 (file)
--- a/vcs-svn/fast_export.h
+++ b/vcs-svn/fast_export.h
@@ -2,13 +2,14 @@
 #define FAST_EXPORT_H_
 
 #include "line_buffer.h"
+struct strbuf;
 
 void fast_export_delete(uint32_t depth, uint32_t *path);
 void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
                        uint32_t mark);
-void fast_export_commit(uint32_t revision, const char *author, char *log,
-                       const char *uuid, const char *url,
-                       unsigned long timestamp);
+void fast_export_commit(uint32_t revision, const char *author,
+                       const struct strbuf *log, const char *uuid,
+                       const char *url, unsigned long timestamp);
 void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len,
                      struct line_buffer *input);