summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-12-08 15:17:34 +0100
committerBram Moolenaar <Bram@vim.org>2011-12-08 15:17:34 +0100
commitaeabe0545d5bcb6a89fad63078fb310f630b77fd (patch)
treee4e18188e06e081036fb6b851db09518588cf82a
parentae7ba984ee6913f36c58960eab2eb2c80538efc4 (diff)
downloadvim-git-aeabe0545d5bcb6a89fad63078fb310f630b77fd.tar.gz
updated for version 7.3.368v7.3.368
Problem: Gcc complains about redefining _FORTIFY_SOURCE. Solution: Undefine it before redefining it.
-rw-r--r--src/Makefile4
-rwxr-xr-xsrc/auto/configure4
-rw-r--r--src/configure.in3
-rw-r--r--src/version.c2
4 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index 5b3248249..869298c97 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -561,8 +561,8 @@ CClink = $(CC)
#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
# Use this with GCC to check for mistakes, unused arguments, etc.
-#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -D_FORTIFY_SOURCE=1
-#CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -D_FORTIFY_SOURCE=1 -DU_DEBUG
+#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
+#CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
diff --git a/src/auto/configure b/src/auto/configure
index e391b1c50..ff2e13b21 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12483,10 +12483,10 @@ $as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+ { $as_echo "$as_me:${as_lineno-$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" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
+ CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
diff --git a/src/configure.in b/src/configure.in
index b09aa220e..7a2b186af 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -3584,9 +3584,10 @@ if test "$GCC" = yes; then
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.
+ dnl And undefine it first to avoid a warning.
AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
if test "$gccmajor" -gt "3"; then
- CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
+ CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
diff --git a/src/version.c b/src/version.c
index 55dba1e0a..2e1de9b09 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 368,
+/**/
367,
/**/
366,