From: Christos Zoulas <christos@zoulas.com>
Date: Wed, 7 Apr 2004 14:23:55 +0000 (+0000)
Subject: Add more conditional defines
X-Git-Tag: FILE5_05~871
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d87b3b881a92e05005df939a1cacf5a66af2174;p=file

Add more conditional defines
---

diff --git a/src/file.c b/src/file.c
index 9e48e95f..269ae861 100644
--- a/src/file.c
+++ b/src/file.c
@@ -77,7 +77,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: file.c,v 1.92 2004/03/22 21:34:39 christos Exp $")
+FILE_RCSID("@(#)$Id: file.c,v 1.93 2004/04/07 14:23:55 christos Exp $")
 #endif	/* lint */
 
 
@@ -453,7 +453,7 @@ byteconv2(int from, int same, int big_endian)
 size_t
 file_mbswidth(const char *s)
 {
-#ifdef HAVE_WCHAR_H
+#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH)
 	size_t bytesconsumed, old_n, n, width = 0;
 	mbstate_t state;
 	wchar_t nextchar;