From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 22 Oct 2008 16:42:21 +0000 (+0200)
Subject: Update gnulib files.
X-Git-Tag: gnutls_2_7_1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ea8cfc25de995a50ea37abc119fe7b622ed1b7;p=thirdparty%2Fgnutls.git

Update gnulib files.
---

diff --git a/gl/m4/netdb_h.m4 b/gl/m4/netdb_h.m4
index ecb57b4e66..bbe166fab4 100644
--- a/gl/m4/netdb_h.m4
+++ b/gl/m4/netdb_h.m4
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 2
+# netdb_h.m4 serial 3
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,8 @@ AC_DEFUN([gl_HEADER_NETDB],
   AC_REQUIRE([gl_NETDB_H_DEFAULTS])
   gl_CHECK_NEXT_HEADERS([netdb.h])
   if test $ac_cv_header_netdb_h = yes; then
-    NETDB_H=''
+    AC_CHECK_TYPES([struct addrinfo], [NETDB_H=''], [NETDB_H='netdb.h'],
+                   [[#include <netdb.h>]])
     HAVE_NETDB_H=1
   else
     NETDB_H='netdb.h'
diff --git a/gl/netdb.in.h b/gl/netdb.in.h
index d470a646f3..66f4fc6921 100644
--- a/gl/netdb.in.h
+++ b/gl/netdb.in.h
@@ -36,7 +36,7 @@
 #ifndef _GL_NETDB_H
 #define _GL_NETDB_H
 
-#if @HAVE_NETDB_H@
+#if @HAVE_NETDB_H@ && HAVE_STRUCT_ADDRINFO
 
 /* Declarations for a platform that has <netdb.h>.  */
 
@@ -45,7 +45,8 @@
 /* Get netdb.h definitions such as struct hostent for MinGW.  */
 #include <sys/socket.h>
 
-/* Declarations for a platform that lacks <netdb.h>.  */
+/* Declarations for a platform that lacks <netdb.h>, or where it is
+   incomplete.  */
 
 #if @GNULIB_GETADDRINFO@
 
diff --git a/lgl/m4/netdb_h.m4 b/lgl/m4/netdb_h.m4
index ecb57b4e66..bbe166fab4 100644
--- a/lgl/m4/netdb_h.m4
+++ b/lgl/m4/netdb_h.m4
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 2
+# netdb_h.m4 serial 3
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,8 @@ AC_DEFUN([gl_HEADER_NETDB],
   AC_REQUIRE([gl_NETDB_H_DEFAULTS])
   gl_CHECK_NEXT_HEADERS([netdb.h])
   if test $ac_cv_header_netdb_h = yes; then
-    NETDB_H=''
+    AC_CHECK_TYPES([struct addrinfo], [NETDB_H=''], [NETDB_H='netdb.h'],
+                   [[#include <netdb.h>]])
     HAVE_NETDB_H=1
   else
     NETDB_H='netdb.h'
diff --git a/lgl/netdb.in.h b/lgl/netdb.in.h
index 62907d9cc8..9ceb98d1cb 100644
--- a/lgl/netdb.in.h
+++ b/lgl/netdb.in.h
@@ -36,7 +36,7 @@
 #ifndef _GL_NETDB_H
 #define _GL_NETDB_H
 
-#if @HAVE_NETDB_H@
+#if @HAVE_NETDB_H@ && HAVE_STRUCT_ADDRINFO
 
 /* Declarations for a platform that has <netdb.h>.  */
 
@@ -45,7 +45,8 @@
 /* Get netdb.h definitions such as struct hostent for MinGW.  */
 #include <sys/socket.h>
 
-/* Declarations for a platform that lacks <netdb.h>.  */
+/* Declarations for a platform that lacks <netdb.h>, or where it is
+   incomplete.  */
 
 #if @GNULIB_GETADDRINFO@
 
diff --git a/lgl/sys_socket.in.h b/lgl/sys_socket.in.h
index 68013e1b13..17022bee5d 100644
--- a/lgl/sys_socket.in.h
+++ b/lgl/sys_socket.in.h
@@ -120,9 +120,9 @@ extern "C" {
 /* Re-define FD_ISSET to avoid a WSA call while we are not using
    network sockets.  */
 static inline int
-rpl_fd_isset (int fd, fd_set * set)
+rpl_fd_isset (SOCKET fd, fd_set * set)
 {
-  int i;
+  u_int i;
   if (set == NULL)
     return 0;