diff options
author | Damien Miller <djm@mindrot.org> | 2014-01-30 11:26:46 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-01-30 11:26:46 +1100 |
commit | f5bbd3b657b6340551c8a95f74a70857ff8fac79 (patch) | |
tree | fc645c6013a866a2d6c34b56c01e224ba280a81d /configure.ac | |
parent | c2868192ddc4e1420a50389e18c05db20b0b1f32 (diff) |
- (djm) [configure.ac atomicio.c] Kludge around NetBSD offering
different symbols for 'read' when various compiler flags are
in use, causing atomicio.c comparisons against it to break and
read/write operations to hang; ok dtucker
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 571362163..dfd32cd85 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.567 2014/01/29 23:21:20 djm Exp $ | 1 | # $Id: configure.ac,v 1.568 2014/01/30 00:26:46 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.567 $) | 18 | AC_REVISION($Revision: 1.568 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -769,6 +769,8 @@ mips-sony-bsd|mips-sony-newsos4) | |||
769 | TEST_MALLOC_OPTIONS="AJRX" | 769 | TEST_MALLOC_OPTIONS="AJRX" |
770 | AC_DEFINE([BROKEN_STRNVIS], [1], | 770 | AC_DEFINE([BROKEN_STRNVIS], [1], |
771 | [NetBSD strnvis argument order is swapped compared to OpenBSD]) | 771 | [NetBSD strnvis argument order is swapped compared to OpenBSD]) |
772 | AC_DEFINE([BROKEN_READ_COMPARISON], [1], | ||
773 | [NetBSD read function is sometimes redirected, breaking atomicio comparisons against it]) | ||
772 | ;; | 774 | ;; |
773 | *-*-freebsd*) | 775 | *-*-freebsd*) |
774 | check_for_libcrypt_later=1 | 776 | check_for_libcrypt_later=1 |