diff options
| author | Damien Miller <djm@mindrot.org> | 2008-05-20 08:57:06 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-05-20 08:57:06 +1000 |
| commit | a7058ec7c03017b89ba75fc0b9a58ca672aab9e9 (patch) | |
| tree | 06fe5502cb5e86566eb93dbae817e127c79f4d8b /mux.c | |
| parent | 58a81148806d8dae74e5aa9c81262fb64a55d872 (diff) | |
| download | openssh-git-a7058ec7c03017b89ba75fc0b9a58ca672aab9e9.tar.gz | |
- (djm) [configure.ac mux.c sftp.c openbsd-compat/Makefile.in]
[openbsd-compat/fmt_scaled.c openbsd-compat/openbsd-compat.h]
Fix compilation on Linux, including pulling in fmt_scaled(3)
implementation from OpenBSD's libutil.
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -17,6 +17,8 @@ /* ssh session multiplexing support */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <sys/stat.h> @@ -32,9 +34,16 @@ #include <stdio.h> #include <string.h> #include <unistd.h> -#include <util.h> #include <paths.h> +#ifdef HAVE_UTIL_H +# include <util.h> +#endif + +#ifdef HAVE_LIBUTIL_H +# include <libutil.h> +#endif + #include "openbsd-compat/sys-queue.h" #include "xmalloc.h" #include "log.h" |