diff options
| author | Karel Zak | 2016-06-03 14:46:17 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-06-03 14:46:17 +0200 |
| commit | c191740c285a71b8ab5bbf4a429a14d0459b2d10 (patch) | |
| tree | 4a8c53c773d4ad0cf7c9c35266a567aafd014cc0 | |
| parent | include/widechar: add missing fallbacks (diff) | |
| download | kernel-qcow2-util-linux-c191740c285a71b8ab5bbf4a429a14d0459b2d10.tar.gz kernel-qcow2-util-linux-c191740c285a71b8ab5bbf4a429a14d0459b2d10.tar.xz kernel-qcow2-util-linux-c191740c285a71b8ab5bbf4a429a14d0459b2d10.zip | |
misc: cleanup non-widechar compilation
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | lib/mbsalign.c | 7 | ||||
| -rw-r--r-- | libsmartcols/src/table.c | 1 | ||||
| -rw-r--r-- | libsmartcols/src/table_print.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/mbsalign.c b/lib/mbsalign.c index d316521f3..5c21ddeb4 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 f61d6b492..0c8198213 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 8034a7834..d2f13f831 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" |