diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/Makefile | 3 | ||||
| -rw-r--r-- | iconv/iconv_prog.c | 3 | ||||
| -rw-r--r-- | iconv/iconv_prog.h | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index fd3575178e..d3405651d6 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -31,7 +31,8 @@ routines += gconv_dl vpath %.c ../locale/programs ../intl iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \ - dummy-repertoire simple-hash xstrdup xmalloc + dummy-repertoire simple-hash xstrdup xmalloc \ + record-status iconvconfig-modules = strtab xmalloc hash-string extra-objs = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o) CFLAGS-iconv_prog.c = -I../locale/programs diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 35d6eb3646..52b9c78afe 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -97,9 +97,6 @@ static const char *to_code = ""; /* File to write output to. If NULL write to stdout. */ static const char *output_file; -/* Nonzero if verbose ouput is wanted. */ -int verbose; - /* Nonzero if list of all coded character sets is wanted. */ static int list; diff --git a/iconv/iconv_prog.h b/iconv/iconv_prog.h index 1571fc9181..cc2a6774a9 100644 --- a/iconv/iconv_prog.h +++ b/iconv/iconv_prog.h @@ -20,11 +20,9 @@ #define _ICONV_PROG_H 1 #include <stdio.h> -#include <charmap.h> - -/* Nonzero if verbose ouput is wanted. */ -extern int verbose; +#include <charmap.h> +#include <record-status.h> /* If nonzero omit invalid character from output. */ extern int omit_invalid; |