Fix inet_ntop on mingw32.

diff --git a/ChangeLog b/ChangeLog
index 8efc39651ebbec11664efef47931469347d44ffa..dbadcea3e7c7bf5e4cc57dd8bbcc3f308351c017 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-20  Simon Josefsson  <jas@extundo.com>
+
+       * modules/inet_ntop (Depends-on): Depend on sys_socket.
+
 2006-01-19  Simon Josefsson  <jas@extundo.com>
 
        * gnulib-tool: Set check_PROGRAMS.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 796e193789ede1709a397e84a9de5a725775ea25..7fb5feb28816ac7d1abd936669e71071b904c3d4 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-20  Simon Josefsson  <jas@extundo.com>
+
+       * inet_ntop.h: Unconditionally include sys/socket.h.
+
 2006-01-19  Simon Josefsson  <jas@extundo.com>
 
        * socket_.h: Map SHUT_RD, SHUT_WR, SHUT_RDWR correctly.

diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index 83f5edf3374d403b5d0e836a160df9eb504afade..69c838d390ca159f693d6a4144221d6d8c23008c 100644 (file)
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -1,5 +1,5 @@
 /* Convert internet address from internal to printable, presentable format.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
+#include <sys/socket.h>
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif

diff --git a/modules/inet_ntop b/modules/inet_ntop
index 4a081086d33ec8d4fb8b888180116fe2c710f6f7..5a5b2c4aacb38bf9f9c33829c9edee09b6491670 100644 (file)
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -10,6 +10,7 @@ m4/sockpfaf.m4
 Depends-on:
 restrict
 socklen
+sys_socket
 
 configure.ac:
 gl_INET_NTOP