From 3fb9e63b907186c70fb79e818d899ccb67b4b421 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 14 Mar 2018 07:29:04 -0500 Subject: bump base requirement to Windows Vista, use builtin inet_ntop/pton --- m4/check-libc.m4 | 4 +--- m4/check-os-options.m4 | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'm4') diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index 5bb4287..cacdd17 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 @@ -2,7 +2,7 @@ AC_DEFUN([CHECK_LIBC_COMPAT], [ # Check for libc headers AC_CHECK_HEADERS([err.h readpassphrase.h]) # Check for general libc functions -AC_CHECK_FUNCS([asprintf freezero inet_ntop inet_pton memmem]) +AC_CHECK_FUNCS([asprintf freezero memmem]) AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray]) AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum]) AC_CHECK_FUNCS([timegm _mkgmtime]) @@ -22,8 +22,6 @@ AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [ AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) -AM_CONDITIONAL([HAVE_INET_NTOP], [test "x$ac_cv_func_inet_ntop" = xyes]) -AM_CONDITIONAL([HAVE_INET_PTON], [test "x$ac_cv_func_inet_pton" = xyes]) AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) AM_CONDITIONAL([HAVE_READPASSPHRASE], [test "x$ac_cv_func_readpassphrase" = xyes]) AM_CONDITIONAL([HAVE_REALLOCARRAY], [test "x$ac_cv_func_reallocarray" = xyes]) diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 3cf1956..414e63d 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 @@ -106,7 +106,7 @@ char buf[1]; getentropy(buf, 1); BUILD_NC=no CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO" CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" - CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0501" + CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SPEED" AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) ;; -- cgit v1.2.3-55-g6feb