- (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.

1 files changed, 10 insertions, 1 deletions

diff --git a/mux.c b/mux.c
index 78ba63153..b4465b017 100644
--- a/mux.c
+++ b/mux.c
@@ -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"