Re: provide inet_?to? declarations in arpa_inet.h

[Simon Josefsson]

Simon Josefsson <address@hidden> writes:

> Bruno Haible <address@hidden> writes:
>
>> Hi Simon,
>>
>>> I would also favor removing both inet_ntop.h and inet_pton.h, and use
>>> arpa/inet.h for the declarations, as you suggested.
>>
>> Me too.
>
> Yoann, Bruno,
> I've pushed the following, please test it.

I've tested it better now, and needed the following.  Pushed.

/Simon

>From aa1d60fec96400b6f0a07bf2701b8bc1ba955077 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Tue, 29 Apr 2008 11:26:41 +0200
Subject: [PATCH] Make arpa/inet module build under MinGW.

---
 ChangeLog         |    7 +++++++
 m4/arpa_inet_h.m4 |    3 +++
 modules/arpa_inet |    2 ++
 3 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f90e61..7dd2b27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-29  Simon Josefsson  <address@hidden>
+
+       * m4/arpa_inet_h.m4 (gl_ARPA_INET_H_DEFAULTS): Set
+       HAVE_DECL_INET_NTOP and HAVE_DECL_INET_PTON.
+
+       * modules/arpa_inet (arpa/inet.h): Use them.
+
 2008-04-28  Eric Blake  <address@hidden>
 
        Test getndelim2.
diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index 8f530c5..baddf0d 100644
--- a/m4/arpa_inet_h.m4
+++ b/m4/arpa_inet_h.m4
@@ -32,4 +32,7 @@ AC_DEFUN([gl_ARPA_INET_H_DEFAULTS],
 [
   GNULIB_INET_NTOP=0;     AC_SUBST([GNULIB_INET_NTOP])
   GNULIB_INET_PTON=0;     AC_SUBST([GNULIB_INET_PTON])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_INET_NTOP=1;  AC_SUBST([HAVE_DECL_INET_NTOP])
+  HAVE_DECL_INET_PTON=1;  AC_SUBST([HAVE_DECL_INET_PTON])
 ])
diff --git a/modules/arpa_inet b/modules/arpa_inet
index e5934ac..8c5f3f9 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -24,6 +24,8 @@ arpa/inet.h:
          sed \
              -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \
              -e 's|@''GNULIB_INET_PTON''@|$(GNULIB_INET_PTON)|g' \
+             -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \
+             -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
              < $(srcdir)/arpa_inet.in.h; \
        } > address@hidden
        mv address@hidden $@
-- 
1.5.5