From d87fc699839f068bc14ea189bc2aba4afc986a9c Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Mon, 22 Sep 2014 21:43:02 +0200 Subject: charset.c (conversion): Rename to ... * charset.c (conversion): Rename to ... (cpp_conversion): ... this one; update. * files.c (file_hash_entry): Rename to ... (cpp_file_hash_entry): ... this one ; update. From-SVN: r215482 --- libcpp/charset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libcpp/charset.c') diff --git a/libcpp/charset.c b/libcpp/charset.c index 07a594d..b766eec 100644 --- a/libcpp/charset.c +++ b/libcpp/charset.c @@ -608,13 +608,13 @@ convert_using_iconv (iconv_t cd, const uchar *from, size_t flen, #define APPLY_CONVERSION(CONVERTER, FROM, FLEN, TO) \ CONVERTER.func (CONVERTER.cd, FROM, FLEN, TO) -struct conversion +struct cpp_conversion { const char *pair; convert_f func; iconv_t fake_cd; }; -static const struct conversion conversion_tab[] = { +static const struct cpp_conversion conversion_tab[] = { { "UTF-8/UTF-32LE", convert_utf8_utf32, (iconv_t)0 }, { "UTF-8/UTF-32BE", convert_utf8_utf32, (iconv_t)1 }, { "UTF-8/UTF-16LE", convert_utf8_utf16, (iconv_t)0 }, -- cgit v1.1