diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-10-06 11:27:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-06 11:27:21 +0100 |
| commit | e2982d691186c8a9b16ecc8d831d2472088c8ed8 (patch) | |
| tree | 233a1c1a37dd0bab076f4adac3bb7d2f5dd98cf1 | |
| parent | 78e0fa4cf4fcd563c0bc8c87afa54d4f5dc22020 (diff) | |
patch 8.2.3483: #ifdef for using sysinfo() is incompletev8.2.3483
Problem: #ifdef for using sysinfo() is incomplete.
Solution: Also check for HAVE_SYSINFO. Make autoconf check use TRY_LINK.
(closes #8952)
| -rwxr-xr-x | src/auto/configure | 5 | ||||
| -rw-r--r-- | src/configure.ac | 5 | ||||
| -rw-r--r-- | src/memline.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index be1440d3a7..cab7bc9fca 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -13954,7 +13954,7 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO 1" >>confdefs.h @@ -13962,7 +13962,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 $as_echo "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo.mem_unit" >&5 $as_echo_n "checking for sysinfo.mem_unit... " >&6; } diff --git a/src/configure.ac b/src/configure.ac index d417b90462..bb77485f31 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -4113,9 +4113,10 @@ AC_TRY_COMPILE( AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYSCTL), AC_MSG_RESULT(not usable)) -dnl sysinfo() may exist but not be Linux compatible +dnl sysinfo() may exist but not be Linux compatible. +dnl On some FreeBSD systems it may depend on libsysinfo, use TRY_LINK AC_MSG_CHECKING(for sysinfo) -AC_TRY_COMPILE( +AC_TRY_LINK( [#include <sys/types.h> #include <sys/sysinfo.h>], [ struct sysinfo sinfo; diff --git a/src/memline.c b/src/memline.c index 9fc689f6c5..b43f10e12e 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1109,7 +1109,7 @@ add_b0_fenc( static int swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED) { -# ifdef HAVE_SYSINFO_UPTIME +#if defined(HAVE_SYSINFO) && defined(HAVE_SYSINFO_UPTIME) stat_T st; struct sysinfo sinfo; diff --git a/src/version.c b/src/version.c index b0049e00fb..03b7022ad3 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3483, +/**/ 3482, /**/ 3481, |