Merge branch 'nd/completion-no-cache-failure' into maint

diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
index 10a2cbc40ec1c1ec7a97e967e3420b0b819f6641..625d950bb89405a5607b4d313d4ac3f80f14c49c 100644 (file)
--- a/vcs-svn/svndiff.h
+++ b/vcs-svn/svndiff.h
@@ -4,7 +4,7 @@
 struct line_buffer;
 struct sliding_view;
 
-extern int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
-               struct sliding_view *preimage, FILE *postimage);
+int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
+                  struct sliding_view *preimage, FILE *postimage);
 
 #endif