# HG changeset patch # User Bram Moolenaar # Date 1633516205 -7200 # Node ID 076f9b8e96328950bc125afc717e0e9ece25e78f # Parent 0c4a3229ffa0a1de4905f5d6eb24dc489e8571b3 patch 8.2.3483: #ifdef for using sysinfo() is incomplete Commit: https://github.com/vim/vim/commit/e2982d691186c8a9b16ecc8d831d2472088c8ed8 Author: Bram Moolenaar Date: Wed Oct 6 11:27:21 2021 +0100 patch 8.2.3483: #ifdef for using sysinfo() is incomplete Problem: #ifdef for using sysinfo() is incomplete. Solution: Also check for HAVE_SYSINFO. Make autoconf check use TRY_LINK. (closes #8952) diff --git a/src/auto/configure b/src/auto/configure --- 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 --- 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 #include ], [ struct sysinfo sinfo; diff --git a/src/memline.c b/src/memline.c --- 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 --- 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,