aboutsummaryrefslogtreecommitdiff
path: root/libcpp/charset.c
diff options
context:
space:
mode:
authorJeanHeyd Meneide <phdofthehouse@gmail.com>2020-12-01 14:39:47 -0700
committerJeff Law <law@redhat.com>2020-12-01 14:46:51 -0700
commiteccec8684142e05f2f92f0f5bd5b47dda3ba1529 (patch)
treefe7097d15b7f8eaa5cfa1635f0783e1824908083 /libcpp/charset.c
parent39836f8324d819459cb21198e95b993588c6a2b1 (diff)
downloadgcc-eccec8684142e05f2f92f0f5bd5b47dda3ba1529.zip
gcc-eccec8684142e05f2f92f0f5bd5b47dda3ba1529.tar.gz
gcc-eccec8684142e05f2f92f0f5bd5b47dda3ba1529.tar.bz2
Feature: Macros for identifying the wide and narrow execution string literal encoding
gcc/c-family * c-cppbuiltin.c (c_cpp_builtins): Add predefined {__GNUC_EXECUTION_CHARSET_NAME} and _WIDE_EXECUTION_CHARSET_NAME} macros. gcc/ * doc/cpp.texi: Document new macros. gcc/testsuite/ * c-c++-common/cpp/wide-narrow-predef-macros.c: New test. libcpp/ * charset.c (init_iconv_desc): Initialize "to" and "from" fields. * directives.c (cpp_get_narrow_charset_name): New function. (cpp_get_wide_charset_name): Likewise. * include/cpplib.h (cpp_get_narrow_charset_name): Prototype. (cpp_get_wide_charset_name): Likewise. * internal.h (cset_converter): Add "to" and "from" fields.
Diffstat (limited to 'libcpp/charset.c')
-rw-r--r--libcpp/charset.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libcpp/charset.c b/libcpp/charset.c
index 28b81c9c..3e5578b 100644
--- a/libcpp/charset.c
+++ b/libcpp/charset.c
@@ -638,6 +638,9 @@ init_iconv_desc (cpp_reader *pfile, const char *to, const char *from)
char *pair;
size_t i;
+ ret.to = to;
+ ret.from = from;
+
if (!strcasecmp (to, from))
{
ret.func = convert_no_conversion;