diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-11-15 20:16:40 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-16 09:23:46 +0100 |
commit | 8912421cf3829a4fd65877fd1255125c191f6f89 (patch) | |
tree | 6b89fecf0738a1f80792bbe7453730f7882f1d54 /libguile | |
parent | 3fe87cf7aff396d7bd993aa009f48eb8afd6c1cd (diff) | |
download | guile-8912421cf3829a4fd65877fd1255125c191f6f89.tar.gz |
Use Gnulib's `inet_ntop' and `inet_pton' modules.
* m4/gnulib-cache.m4: Add `inet_ntop' and `inet_pton'.
* configure.ac: Don't check for `inet_ntop' and `inet_pton'.
* libguile/socket.c (scm_inet_pton, scm_inet_ntop): Compile regardless
of `HAVE_INET_PTON' and `HAVE_INET_NTOP' respectively.
* libguile/filesys.c: Use <stdlib.h> instead of <canonicalize.h>.
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/filesys.c | 4 | ||||
-rw-r--r-- | libguile/socket.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c index c602f6735..311f1efab 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2009 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -30,8 +30,8 @@ #endif #include <alloca.h> -#include <canonicalize.h> +#include <stdlib.h> #include <stdio.h> #include <errno.h> diff --git a/libguile/socket.c b/libguile/socket.c index ea2ba5ccb..4f4d392e2 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -352,7 +352,6 @@ scm_to_ipv6 (scm_t_uint8 dst[16], SCM src) scm_wrong_type_arg_msg ("scm_to_ipv6", 0, src, "integer"); } -#ifdef HAVE_INET_PTON SCM_DEFINE (scm_inet_pton, "inet-pton", 2, 0, 0, (SCM family, SCM address), "Convert a string containing a printable network address to\n" @@ -388,9 +387,7 @@ SCM_DEFINE (scm_inet_pton, "inet-pton", 2, 0, 0, return scm_from_ipv6 ((scm_t_uint8 *) dst); } #undef FUNC_NAME -#endif -#ifdef HAVE_INET_NTOP SCM_DEFINE (scm_inet_ntop, "inet-ntop", 2, 0, 0, (SCM family, SCM address), "Convert a network address into a printable string.\n" @@ -435,7 +432,6 @@ SCM_DEFINE (scm_inet_ntop, "inet-ntop", 2, 0, 0, return scm_from_locale_string (dst); } #undef FUNC_NAME -#endif #endif /* HAVE_IPV6 */ |