mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.2-044
This commit is contained in:
parent
03cd93a576
commit
0cd49305c4
24
src/auto/configure
vendored
24
src/auto/configure
vendored
@ -16819,21 +16819,29 @@ if test "x$MACARCH" = "xboth"; then
|
|||||||
LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
|
LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
|
|
||||||
$as_echo_n "checking for GCC 3 or later... " >&6; }
|
|
||||||
DEPEND_CFLAGS_FILTER=
|
DEPEND_CFLAGS_FILTER=
|
||||||
if test "$GCC" = yes; then
|
if test "$GCC" = yes; then
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
|
||||||
|
$as_echo_n "checking for GCC 3 or later... " >&6; }
|
||||||
gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
|
gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
|
||||||
if test "$gccmajor" -gt "2"; then
|
if test "$gccmajor" -gt "2"; then
|
||||||
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
|
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "$DEPEND_CFLAGS_FILTER" = ""; then
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||||
$as_echo "yes" >&6; }
|
$as_echo "yes" >&6; }
|
||||||
|
else
|
||||||
|
{ $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_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
|
||||||
|
if test "$gccmajor" -gt "3"; then
|
||||||
|
CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -3152,18 +3152,25 @@ dnl use "-isystem" instead of "-I" for all non-Vim include dirs.
|
|||||||
dnl But only when making dependencies, cproto and lint don't take "-isystem".
|
dnl But only when making dependencies, cproto and lint don't take "-isystem".
|
||||||
dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
|
dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
|
||||||
dnl the number before the version number.
|
dnl the number before the version number.
|
||||||
AC_MSG_CHECKING(for GCC 3 or later)
|
|
||||||
DEPEND_CFLAGS_FILTER=
|
DEPEND_CFLAGS_FILTER=
|
||||||
if test "$GCC" = yes; then
|
if test "$GCC" = yes; then
|
||||||
|
AC_MSG_CHECKING(for GCC 3 or later)
|
||||||
gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
|
gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
|
||||||
if test "$gccmajor" -gt "2"; then
|
if test "$gccmajor" -gt "2"; then
|
||||||
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
|
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "$DEPEND_CFLAGS_FILTER" = ""; then
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
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.
|
||||||
|
AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
|
||||||
|
if test "$gccmajor" -gt "3"; then
|
||||||
|
CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
AC_SUBST(DEPEND_CFLAGS_FILTER)
|
AC_SUBST(DEPEND_CFLAGS_FILTER)
|
||||||
|
|
||||||
|
@ -21150,8 +21150,11 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict)
|
|||||||
init_var_dict(&fc.l_avars, &fc.l_avars_var);
|
init_var_dict(&fc.l_avars, &fc.l_avars_var);
|
||||||
add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
|
add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
|
||||||
(varnumber_T)(argcount - fp->uf_args.ga_len));
|
(varnumber_T)(argcount - fp->uf_args.ga_len));
|
||||||
|
/* Use "name" to avoid a warning from some compiler that checks the
|
||||||
|
* destination size. */
|
||||||
v = &fc.fixvar[fixvar_idx++].var;
|
v = &fc.fixvar[fixvar_idx++].var;
|
||||||
STRCPY(v->di_key, "000");
|
name = v->di_key;
|
||||||
|
STRCPY(name, "000");
|
||||||
v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
|
v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
|
||||||
hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
|
hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
|
||||||
v->di_tv.v_type = VAR_LIST;
|
v->di_tv.v_type = VAR_LIST;
|
||||||
|
@ -676,6 +676,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
44,
|
||||||
/**/
|
/**/
|
||||||
43,
|
43,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user