summaryrefslogtreecommitdiff
path: root/gl
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-10-22 18:42:21 +0200
committerSimon Josefsson <simon@josefsson.org>2008-10-22 18:42:21 +0200
commit83ea8cfc25de995a50ea37abc119fe7b622ed1b7 (patch)
treea7c5a65a8f25f88c262ed81a4b44dd928e3aeee0 /gl
parenta71df0a23d8bbd17e30fb0d527df087e8cf28f10 (diff)
downloadgnutls-83ea8cfc25de995a50ea37abc119fe7b622ed1b7.tar.gz
Update gnulib files.
Diffstat (limited to 'gl')
-rw-r--r--gl/m4/netdb_h.m45
-rw-r--r--gl/netdb.in.h5
2 files changed, 6 insertions, 4 deletions
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@