Merge branch 'sg/progress-off-by-one-fix'

diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
index b43a825cbabe92b8b9da7d1ff2856763fe26fc29..a7fc0999cb63c2abd9dd01f14aacabf40d986b13 100644 (file)
--- a/vcs-svn/sliding_window.h
+++ b/vcs-svn/sliding_window.h
@@ -1,5 +1,5 @@
-#ifndef SLIDING_WINDOW_H_
-#define SLIDING_WINDOW_H_
+#ifndef SLIDING_WINDOW_H
+#define SLIDING_WINDOW_H
 
 #include "strbuf.h"
 
@@ -13,6 +13,6 @@ struct sliding_view {
 
 #define SLIDING_VIEW_INIT(input, len)  { (input), 0, 0, (len), STRBUF_INIT }
 
-extern int move_window(struct sliding_view *view, off_t off, size_t width);
+int move_window(struct sliding_view *view, off_t off, size_t width);
 
 #endif