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 /scp.c | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -103,7 +103,7 @@ | |||
| 103 | #include <string.h> | 103 | #include <string.h> |
| 104 | #include <time.h> | 104 | #include <time.h> |
| 105 | #include <unistd.h> | 105 | #include <unistd.h> |
| 106 | #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) | 106 | #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) |
| 107 | #include <vis.h> | 107 | #include <vis.h> |
| 108 | #endif | 108 | #endif |
| 109 | 109 | ||