- (dtucker) [configure.ac] Some platforms need sys/types.h before sys/un.h.

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4345d9956..4b1536bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
  - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr.
    feedback and ok dtucker
  - (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker
+ - (dtucker) [configure.ac] Some platforms need sys/types.h before sys/un.h.
 
 20130601
  - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/configure.ac b/configure.ac
index b8a610d5c..6f82c3fbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.531 2013/06/02 21:05:49 tim Exp $
+# $Id: configure.ac,v 1.532 2013/06/02 23:30:45 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.531 $)
+AC_REVISION($Revision: 1.532 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -388,6 +388,7 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], [
 # Android requires sys/socket.h to be included before sys/un.h
 AC_CHECK_HEADERS([sys/un.h], [], [], [
 #include <sys/socket.h>
+#include <sys/types.h>
 ])
 
 # Messages for features tested for in target-specific section