diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-12-16 16:14:51 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-12-16 16:14:51 +0000 |
| commit | 56d1db3067b3ce4888b94c9635beed563aa8e211 (patch) | |
| tree | ba5116e9ae328371acb10ec5f0e3f4cbb53ff2db | |
| parent | 72951077b9c6ef5a87e50da22a6f91735a1d2d25 (diff) | |
updated for version 7.2-316v7.2.316
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index f7be0a777a..f586b8f6c5 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -17185,10 +17185,10 @@ $as_echo "yes" >&6; } { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5 + { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5 $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } if test "$gccmajor" -gt "3"; then - CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'` + CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'` { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/src/configure.in b/src/configure.in index 6e292c4c66..6bc8fd75c6 100644 --- a/src/configure.in +++ b/src/configure.in @@ -3241,9 +3241,10 @@ if test "$GCC" = yes; then fi dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is dnl declared as char x[1] but actually longer. Introduced in gcc 4.0. + dnl Also remove duplicate _FORTIFY_SOURCE arguments. AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) if test "$gccmajor" -gt "3"; then - CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'` + CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'` AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) diff --git a/src/version.c b/src/version.c index 874b163fd4..b9ab57ac11 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 316, +/**/ 315, /**/ 314, |