summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-06-04 12:55:24 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-06-04 12:55:24 +1000
commit16cac190ebb9b5612cccea63a7c22ac33bc9a07a (patch)
tree8a039a4eb1fb1ec6f24c6062696cca95cd2ba425
parent0b43ffe143a5843703c3755fa040b8684fb04134 (diff)
- (dtucker) [configure.ac] Some other platforms need sys/types.h before
sys/socket.h.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b1536bf..555fede3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
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.
+ - (dtucker) [configure.ac] Some other platforms need sys/types.h before
+ sys/socket.h.
20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/configure.ac b/configure.ac
index 6f82c3fb..2cd910cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.532 2013/06/02 23:30:45 dtucker Exp $
+# $Id: configure.ac,v 1.533 2013/06/04 02:55:24 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.532 $)
+AC_REVISION($Revision: 1.533 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@@ -387,8 +387,8 @@ 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>
+#include <sys/socket.h>
])
# Messages for features tested for in target-specific section