Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | Fixes to allow diffutils to build with gcc v6. |
| 2 | |
| 3 | RP |
| 4 | 2016/5/25 |
| 5 | |
| 6 | Index: diffutils-2.8.1/lib/posix/regex.h |
| 7 | =================================================================== |
| 8 | --- diffutils-2.8.1.orig/lib/posix/regex.h |
| 9 | +++ diffutils-2.8.1/lib/posix/regex.h |
| 10 | @@ -529,7 +529,9 @@ extern int re_exec _RE_ARGS ((const char |
| 11 | /* For now unconditionally define __restrict_arr to expand to nothing. |
| 12 | Ideally we would have a test for the compiler which allows defining |
| 13 | it to restrict. */ |
| 14 | +#ifndef __restrict_arr |
| 15 | #define __restrict_arr |
| 16 | +#endif |
| 17 | |
| 18 | /* POSIX compatibility. */ |
| 19 | extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, |
| 20 | Index: diffutils-2.8.1/src/diff.c |
| 21 | =================================================================== |
| 22 | --- diffutils-2.8.1.orig/src/diff.c |
| 23 | +++ diffutils-2.8.1/src/diff.c |
| 24 | @@ -71,6 +71,7 @@ static void usage (void); |
| 25 | static bool recursive; |
| 26 | |
| 27 | /* In context diffs, show previous lines that match these regexps. */ |
| 28 | +struct re_pattern_buffer function_regexp; |
| 29 | static struct regexp_list function_regexp_list; |
| 30 | |
| 31 | /* Ignore changes affecting only lines that match these regexps. */ |