misc: cleanup non-widechar compilation

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

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index d316521f363f9341c69805fbc70bbb84c07c2cf3..5c21ddeb44d5e07b9410ff99f78322d96d219b71 100644 (file)
--- 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 f61d6b492f2e23e1567f26b9584bd4de2eaa9bf1..0c8198213e8698bb417129d392a1ba476a7631c2 100644 (file)
--- 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 8034a7834f68eea2d60af9964b912122a242994a..d2f13f83194f507fcf4f895e5d8c07d2fb8fb444 100644 (file)
--- 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"