From b103138b1e9ff2330901a0bc06378d2e5ed4f9ae Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 12 Nov 2014 15:45:21 +0100 Subject: [PATCH] updated for version 7.4.510 Problem: "-fwrapv" argument breaks use of cproto. Solution: Remove the alphabetic arguments in a drastic way. --- src/Makefile | 7 +++---- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 39e2de99f9..6bf8c1737d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1779,13 +1779,12 @@ update-po: proto: $(PRO_AUTO) $(PRO_MANUAL) # Filter out arguments that cproto doesn't support. -# Don't pass "-pthread" to cproto, it sees it as a list of individual flags. -# Don't pass "-fstack-protector" to cproto, for the same reason. -# Don't pass "-g" to cproto. +# Don't pass "-pthread", "-fwrapv" and similar arguments to cproto, it sees +# them as a list of individual flags. # The -E"gcc -E" argument must be separate to avoid problems with shell # quoting. CPROTO = cproto $(PROTO_FLAGS) -DPROTO \ - `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g' -e 's/\ -g\ / /g'` + `echo '$(LINT_CFLAGS)' | sed -e 's/ -[a-z-]\+//g'` ### Would be nice if this would work for "normal" make. ### Currently it only works for (Free)BSD make. diff --git a/src/version.c b/src/version.c index 06c4016bec..89272be506 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 510, /**/ 509, /**/