aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

patch 8.2.3420: _REENTRANT defined more than once

Browse Source 
Problem:    _REENTRANT defined more than once.
Solution:   Fix configure script. (Christian Brabandt, closes #8852)
This commit is contained in:
Christian Brabandt
2021-09-09 17:14:50 +02:00
committed by Bram Moolenaar
parent 0325d3967c
commit 6b9efdde78
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/auto/configure vendored
View File

@@ -12978,7 +12978,9 @@ if test "$enable_canberra" = "yes"; then
$as_echo_n "checking for libcanberra... " >&6; } $as_echo_n "checking for libcanberra... " >&6; }
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $canberra_cflags" if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
LIBS="$LIBS $canberra_lib" LIBS="$LIBS $canberra_lib"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@@ -14960,7 +14962,7 @@ $as_echo "no" >&6; }
fi fi
fi fi
if `echo "$CFLAGS" | grep -v D_XEENTRANT >/dev/null`; then if `echo "$CFLAGS" | grep -v D_REENTRANT >/dev/null`; then
CFLAGS="$CFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT"
fi fi

4
src/configure.ac
View File

@@ -3756,7 +3756,9 @@ if test "$enable_canberra" = "yes"; then
AC_MSG_CHECKING(for libcanberra) AC_MSG_CHECKING(for libcanberra)
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $canberra_cflags" if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
LIBS="$LIBS $canberra_lib" LIBS="$LIBS $canberra_lib"
AC_TRY_LINK([ AC_TRY_LINK([
# include <canberra.h> # include <canberra.h>

2
src/version.c
View File

@@ -755,6 +755,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 */
/**/
3420,
/**/ /**/
3419, 3419,
/**/ /**/