Merge branch 'ff/c99' into next

* ff/c99:
  Remove all void-pointer arithmetic.

1 files changed, 1 insertions, 1 deletions

diff --git a/diff.c b/diff.c
index bc32a4aa29..22b643cc25 100644
--- a/diff.c
+++ b/diff.c
@@ -560,7 +560,7 @@ static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
 		else
 			line[0] = bytes - 26 + 'a' - 1;
 		encode_85(line + 1, cp, bytes);
-		cp += bytes;
+		cp = (char *) cp + bytes;
 		puts(line);
 	}
 	printf("\n");