From: Mats Erik Andersson <mats.andersson@gisladisker.se>
Date: Sun, 10 Apr 2011 00:47:51 +0000 (+0200)
Subject: getaddrinfo: Fix test for sa_len member.
X-Git-Tag: v0.1~2959
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=62f3b86f62d54b61c03a12b9b1674cfb996d9976;p=gnulib.git

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>.
---

diff --git a/ChangeLog b/ChangeLog
index 22d0ce7e7..5bdd6b299 100644
--- 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-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	maint: change "can not" to "cannot"
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 94c276f83..e57623694 100644
--- 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])