Merge branch 'sz/maint-curl-multi-timeout'

diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h
index 8901f214bafce3917025721137a85d827cd1c1a6..ee23b4f490258548a7c50fa7c9a50213b70f5359 100644 (file)
--- a/vcs-svn/line_buffer.h
+++ b/vcs-svn/line_buffer.h
@@ -14,7 +14,6 @@ struct line_buffer {
 int buffer_init(struct line_buffer *buf, const char *filename);
 int buffer_fdinit(struct line_buffer *buf, int fd);
 int buffer_deinit(struct line_buffer *buf);
-void buffer_reset(struct line_buffer *buf);
 
 int buffer_tmpfile_init(struct line_buffer *buf);
 FILE *buffer_tmpfile_rewind(struct line_buffer *buf);  /* prepare to write. */