diff options
| author | Bruno Haible <bruno@clisp.org> | 2019-06-30 15:08:05 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-06-30 15:08:05 +0200 |
| commit | 6136e937969578bf4d5403b86ea3c4c8eb16d268 (patch) | |
| tree | 25372da62f34c92b3e7c6e37141abb362fdeb61d | |
| parent | 326d9f99229c4b7dea6fcc48a4e24eda53a348a8 (diff) | |
| download | gnulib-6136e937969578bf4d5403b86ea3c4c8eb16d268.tar.gz | |
inet_ntop, inet_pton: Forward-compatibility with newer Windows versions.
* m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): On native Windows, set
REPLACE_INET_NTOP to 1 always.
* m4/inet_pton.m4 (gl_FUNC_INET_PTON): On native Windows, set
REPLACE_INET_PTON to 1 always.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/inet_ntop.m4 | 11 | ||||
| -rw-r--r-- | m4/inet_pton.m4 | 11 |
3 files changed, 20 insertions, 10 deletions
@@ -1,5 +1,13 @@ 2019-06-30 Bruno Haible <bruno@clisp.org> + inet_ntop, inet_pton: Forward-compatibility with newer Windows versions. + * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): On native Windows, set + REPLACE_INET_NTOP to 1 always. + * m4/inet_pton.m4 (gl_FUNC_INET_PTON): On native Windows, set + REPLACE_INET_PTON to 1 always. + +2019-06-30 Bruno Haible <bruno@clisp.org> + inet_pton: Fix link error on mingw with _WIN32_WINNT >= 0x0600. * modules/inet_pton (Depends-on, configure.ac): Test REPLACE_INET_PTON, not REPLACE_INET_NTOP. diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 3804e883e7..d71246ba72 100644 --- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,4 +1,4 @@ -# inet_ntop.m4 serial 20 +# inet_ntop.m4 serial 21 dnl Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,15 +24,16 @@ AC_DEFUN([gl_FUNC_INET_NTOP], INET_NTOP_LIB= gl_PREREQ_SYS_H_WINSOCK2 if test $HAVE_WINSOCK2_H = 1; then + dnl It needs to be overridden, because the stdcall calling convention + dnl is not compliant with POSIX. Set REPLACE_INET_NTOP in order to avoid + dnl a name conflict at the linker level, even though the header file + dnl <ws2tcpip.h> declares inet_ntop only if _WIN32_WINNT >= 0x0600. + REPLACE_INET_NTOP=1 AC_CHECK_DECLS([inet_ntop],,, [[#include <ws2tcpip.h>]]) if test $ac_cv_have_decl_inet_ntop = yes; then - dnl It needs to be overridden, because the stdcall calling convention - dnl is not compliant with POSIX. - REPLACE_INET_NTOP=1 INET_NTOP_LIB="-lws2_32" else HAVE_DECL_INET_NTOP=0 - HAVE_INET_NTOP=0 fi else gl_save_LIBS=$LIBS diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 72a9bc2e5b..264892c1ee 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,4 +1,4 @@ -# inet_pton.m4 serial 18 +# inet_pton.m4 serial 19 dnl Copyright (C) 2006, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,15 +24,16 @@ AC_DEFUN([gl_FUNC_INET_PTON], INET_PTON_LIB= gl_PREREQ_SYS_H_WINSOCK2 if test $HAVE_WINSOCK2_H = 1; then + dnl It needs to be overridden, because the stdcall calling convention + dnl is not compliant with POSIX. Set REPLACE_INET_PTON in order to avoid + dnl a name conflict at the linker level, even though the header file + dnl <ws2tcpip.h> declares inet_pton only if _WIN32_WINNT >= 0x0600. + REPLACE_INET_PTON=1 AC_CHECK_DECLS([inet_pton],,, [[#include <ws2tcpip.h>]]) if test $ac_cv_have_decl_inet_pton = yes; then - dnl It needs to be overridden, because the stdcall calling convention - dnl is not compliant with POSIX. - REPLACE_INET_PTON=1 INET_PTON_LIB="-lws2_32" else HAVE_DECL_INET_PTON=0 - HAVE_INET_PTON=0 fi else gl_save_LIBS=$LIBS |