浏览代码

package/librsync: fix build error with gcc7

Fixes
http://autobuild.buildroot.net/results/4a1/4a1931565674442c6117b2b202a002dd0ec12a4b/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit eb7e07702c2f9d7c97a8ac31009ce3e56f4bd577)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Bernd Kuhls 8 年之前
父节点
当前提交
251a65c915
共有 1 个文件被更改,包括 37 次插入0 次删除
  1. 37 0
      package/librsync/0001-fix-build-with-clang.patch

+ 37 - 0
package/librsync/0001-fix-build-with-clang.patch

@@ -0,0 +1,37 @@
+From 1175b1cd102ee15512185c7983868e5746959da0 Mon Sep 17 00:00:00 2001
+From: Adam Schubert <feartohell@seznam.cz>
+Date: Mon, 11 May 2015 04:25:45 +0200
+Subject: [PATCH] Fix build under clang
+
+Downloaded from upstream commit:
+https://github.com/librsync/librsync/commit/1175b1cd102ee15512185c7983868e5746959da0.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+---
+ delta.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/delta.c b/delta.c
+index 19498f9..72afdf6 100644
+--- a/delta.c
++++ b/delta.c
+@@ -126,12 +126,12 @@ static rs_result rs_delta_s_scan(rs_job_t *job);
+ static rs_result rs_delta_s_flush(rs_job_t *job);
+ static rs_result rs_delta_s_end(rs_job_t *job);
+ void rs_getinput(rs_job_t *job);
+-inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len);
+-inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len);
+-inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
+-inline rs_result rs_appendflush(rs_job_t *job);
+-inline rs_result rs_processmatch(rs_job_t *job);
+-inline rs_result rs_processmiss(rs_job_t *job);
++static inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len);
++static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len);
++static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
++static inline rs_result rs_appendflush(rs_job_t *job);
++static inline rs_result rs_processmatch(rs_job_t *job);
++static inline rs_result rs_processmiss(rs_job_t *job);
+ 
+ /**
+  * \brief Get a block of data if possible, and see if it matches.