diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
| commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
| tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /iconv/iconv_prog.h | |
| parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
| parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) | |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'iconv/iconv_prog.h')
| -rw-r--r-- | iconv/iconv_prog.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/iconv/iconv_prog.h b/iconv/iconv_prog.h index c6c289521f..3273ad6125 100644 --- a/iconv/iconv_prog.h +++ b/iconv/iconv_prog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2016 Free Software Foundation, Inc. +/* Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. @@ -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; |