diff options
| author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
| commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
| tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /monitor_wrap.c | |
| parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
| parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) | |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index b1b1c3a61..ee2dc2027 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
| @@ -40,7 +40,13 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); | |||
| 40 | #include "packet.h" | 40 | #include "packet.h" |
| 41 | #include "mac.h" | 41 | #include "mac.h" |
| 42 | #include "log.h" | 42 | #include "log.h" |
| 43 | #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ | ||
| 44 | #undef TARGET_OS_MAC | ||
| 43 | #include "zlib.h" | 45 | #include "zlib.h" |
| 46 | #define TARGET_OS_MAC 1 | ||
| 47 | #else | ||
| 48 | #include "zlib.h" | ||
| 49 | #endif | ||
| 44 | #include "monitor.h" | 50 | #include "monitor.h" |
| 45 | #include "monitor_wrap.h" | 51 | #include "monitor_wrap.h" |
| 46 | #include "xmalloc.h" | 52 | #include "xmalloc.h" |