diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
| commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
| tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /openbsd-compat/vis.c | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'openbsd-compat/vis.c')
| -rw-r--r-- | openbsd-compat/vis.c | 2 |
1 files changed, 1 insertions, 1 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> |