Mercurial > hg > octave-kai > gnulib-hg

diff modules/inet_ntop @ 15633:c2c292001fc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inet_ntop: Support for MSVC on Windows Vista or newer. * lib/arpa_inet.in.h (inet_ntop): Also consider REPLACE_INET_NTOP. * lib/inet_ntop.c (rpl_inet_ntop): Use a simple wrapper if HAVE_DECL_INET_NTOP is defined. * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Invoke gl_PREREQ_SYS_H_WINSOCK2. On platforms with <winsock2.h>, test whether inet_ntop is declared in <ws2tcpip.h>. If so, arrange to replace it. * m4/arpa_inet_h.m4 (gl_ARPA_INET_H_DEFAULTS): Initialize REPLACE_INET_NTOP. * modules/arpa_inet (Makefile.am): Substitute REPLACE_INET_NTOP. * modules/inet_ntop (Files): Add m4/sys_socket_h.m4. (Depends-on, configure.ac): Update condition. * doc/posix-functions/inet_ntop.texi: Mention the MSVC problem.
author Bruno Haible <bruno@clisp.org>
date Sat, 17 Sep 2011 14:56:11 +0200 (2011-09-17)
parents 734141d3f8bf
children
line wrap: on
line diff
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -4,17 +4,18 @@
 Files:
 lib/inet_ntop.c
 m4/inet_ntop.m4
+m4/sys_socket_h.m4
 
 Depends-on:
 arpa_inet
 extensions
-sys_socket      [test $HAVE_INET_NTOP = 0]
-errno           [test $HAVE_INET_NTOP = 0]
-netinet_in      [test $HAVE_INET_NTOP = 0]
+sys_socket      [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
+errno           [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
+netinet_in      [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
 
 configure.ac:
 gl_FUNC_INET_NTOP
-if test $HAVE_INET_NTOP = 0; then
+if test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1; then
   AC_LIBOBJ([inet_ntop])
   gl_PREREQ_INET_NTOP
 fi