getaddrinfo: Fix test for sa_len member.

* m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): When testing for sa_len,
include <sys/types.h> before <sys/socket.h>.
(cherry picked from commit 62f3b86f62d54b61c03a12b9b1674cfb996d9976)

diff --git a/ChangeLog b/ChangeLog
index be8e40e..b52f24a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-09  Mats Erik Andersson  <mats.andersson@gisladisker.se>  (tiny change)
+
+       getaddrinfo: Fix test for sa_len member.
+       * m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): When testing for sa_len,
+       include <sys/types.h> before <sys/socket.h>.
+
 2011-04-08  Eric Blake  <eblake@redhat.com>
 
        fcntl-h: fix O_ACCMODE on cygwin

diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 94c276f..e576236 100644 (file)
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 23
+# getaddrinfo.m4 serial 24
 dnl Copyright (C) 2004-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -105,7 +105,10 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
 
   dnl Including sys/socket.h is wrong for Windows, but Windows does not
   dnl have sa_len so the result is correct anyway.
-  AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [#include <sys/socket.h>])
+  AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [
+#include <sys/types.h>
+#include <sys/socket.h>
+])
 
   AC_CHECK_HEADERS_ONCE([netinet/in.h])