diff options
| author | Damien Miller <djm@mindrot.org> | 2013-03-20 12:55:14 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-03-20 12:55:14 +1100 |
| commit | 63b4bcd04e1c57b77eabb4e4d359508a4b2af685 (patch) | |
| tree | 751bcf38b2b4d26e7b69df583b08ef969fb04548 /openbsd-compat | |
| parent | aa86c3970f24fc22185a9561ae84eeae0c6d15cd (diff) | |
- (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
[openbsd-compat/vis.h] FreeBSD's strnvis isn't compatible with OpenBSD's
so mark it as broken. Patch from des AT des.no
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/vis.c | 2 | ||||
| -rw-r--r-- | openbsd-compat/vis.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c index 3a087b341..f6f5665c1 100644 --- a/openbsd-compat/vis.c +++ b/openbsd-compat/vis.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | /* OPENBSD ORIGINAL: lib/libc/gen/vis.c */ | 31 | /* OPENBSD ORIGINAL: lib/libc/gen/vis.c */ |
| 32 | 32 | ||
| 33 | #include "includes.h" | 33 | #include "includes.h" |
| 34 | #if !defined(HAVE_STRNVIS) | 34 | #if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) |
| 35 | 35 | ||
| 36 | #include <ctype.h> | 36 | #include <ctype.h> |
| 37 | #include <string.h> | 37 | #include <string.h> |
diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h index 3898a9e70..d1286c99d 100644 --- a/openbsd-compat/vis.h +++ b/openbsd-compat/vis.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | /* OPENBSD ORIGINAL: include/vis.h */ | 35 | /* OPENBSD ORIGINAL: include/vis.h */ |
| 36 | 36 | ||
| 37 | #include "includes.h" | 37 | #include "includes.h" |
| 38 | #if !defined(HAVE_STRNVIS) | 38 | #if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) |
| 39 | 39 | ||
| 40 | #ifndef _VIS_H_ | 40 | #ifndef _VIS_H_ |
| 41 | #define _VIS_H_ | 41 | #define _VIS_H_ |
| @@ -92,4 +92,4 @@ ssize_t strnunvis(char *, const char *, size_t) | |||
| 92 | 92 | ||
| 93 | #endif /* !_VIS_H_ */ | 93 | #endif /* !_VIS_H_ */ |
| 94 | 94 | ||
| 95 | #endif /* !HAVE_STRNVIS */ | 95 | #endif /* !HAVE_STRNVIS || BROKEN_STRNVIS */ |