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.h | |
| 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.h')
| -rw-r--r-- | openbsd-compat/vis.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |