From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 6 Jun 2016 01:36:13 +0000 (+1000)
Subject: Add compat bits to utf8.c.
X-Git-Tag: V_7_3_P1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df820722e40309c9b3f360ea4ed47a584ed74333;p=thirdparty%2Fopenssh-portable.git

Add compat bits to utf8.c.
---

diff --git a/utf8.c b/utf8.c
index 18ee53858..6445b3766 100644
--- a/utf8.c
+++ b/utf8.c
@@ -20,6 +20,8 @@
  * in particular to sanitize untrusted strings for terminal output.
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <langinfo.h>
 #include <limits.h>
@@ -27,7 +29,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vis.h>
+#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
+# include <vis.h>
+#endif
 #include <wchar.h>
 
 #include "utf8.h"