Merge branch 'jc/am-3-nonstandard-popt'

diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c
index 9ee41bbc90807ddd82b63c9250f670fecf86a7f5..1647c1a780c5a6153455fdc73b6e422b474dab8e 100644 (file)
--- a/vcs-svn/svndiff.c
+++ b/vcs-svn/svndiff.c
@@ -295,7 +295,7 @@ int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
        if (read_magic(delta, &delta_len))
                return -1;
        while (delta_len) {     /* For each window: */
-               off_t pre_off;
+               off_t pre_off = pre_off; /* stupid GCC... */
                size_t pre_len;
 
                if (read_offset(delta, &pre_off, &delta_len) ||