Merge branch 'jc/grep' into next

diff --git a/patch-delta.c b/patch-delta.c
index d95f0d9721dd87c0d4aff485e32e0a68623ee5cc..8f318ed8aaf180419f97887501317fc1d2b54c09 100644 (file)
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -13,8 +13,8 @@
 #include <string.h>
 #include "delta.h"
 
-void *patch_delta(void *src_buf, unsigned long src_size,
-                 void *delta_buf, unsigned long delta_size,
+void *patch_delta(const void *src_buf, unsigned long src_size,
+                 const void *delta_buf, unsigned long delta_size,
                  unsigned long *dst_size)
 {
        const unsigned char *data, *top;