From: Karel Zak <kzak@redhat.com>
Date: Fri, 3 Jun 2016 12:46:17 +0000 (+0200)
Subject: misc: cleanup non-widechar compilation
X-Git-Tag: v2.29-rc1~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c191740c285a71b8ab5bbf4a429a14d0459b2d10;p=thirdparty%2Futil-linux.git

misc: cleanup non-widechar compilation

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index d316521f36..5c21ddeb44 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -351,7 +351,12 @@ mbsalign (const char *src, char *dest, size_t dest_size,
 
 size_t
 mbsalign_with_padding (const char *src, char *dest, size_t dest_size,
-	               size_t *width, mbs_align_t align, int flags,
+	               size_t *width, mbs_align_t align,
+#ifdef HAVE_WIDECHAR
+		       int flags,
+#else
+		       int flags __attribute__((__unused__)),
+#endif
 		       int padchar)
 {
   size_t ret = -1;
diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index f61d6b492f..0c8198213e 100644
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -25,7 +25,6 @@
 #include <ctype.h>
 
 #include "nls.h"
-#include "widechar.h"
 #include "smartcolsP.h"
 
 #ifdef HAVE_WIDECHAR
diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index 8034a7834f..d2f13f8319 100644
--- a/libsmartcols/src/table_print.c
+++ b/libsmartcols/src/table_print.c
@@ -22,9 +22,7 @@
 #include <termios.h>
 #include <ctype.h>
 
-#include "nls.h"
 #include "mbsalign.h"
-#include "widechar.h"
 #include "ttyutils.h"
 #include "carefulputc.h"
 #include "smartcolsP.h"