diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
commit | 16c9ca827cd735002dec5689f93f22fc358d6f56 (patch) | |
tree | fbfaa8e020a3a762a96c4f219d4150e369e00099 /iconv/gconv_builtin.h | |
parent | daa262720d3dc357a298b18a359551994082c9b3 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/bits_atomic.h_multiple_threads' into t/bits_atomic.h_multiple_threadst/bits_atomic.h_multiple_threads
Diffstat (limited to 'iconv/gconv_builtin.h')
-rw-r--r-- | iconv/gconv_builtin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h index 856d0a9c6f..b8bed3e866 100644 --- a/iconv/gconv_builtin.h +++ b/iconv/gconv_builtin.h @@ -1,5 +1,5 @@ /* Builtin transformations. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -84,7 +84,7 @@ BUILTIN_ALIAS ("OSF00010020//", "ANSI_X3.4-1968//") BUILTIN_TRANSFORMATION ("ANSI_X3.4-1968//", "INTERNAL", 1, "=ascii->INTERNAL", __gconv_transform_ascii_internal, __gconv_btwoc_ascii, - 4, 4, 1, 1) + 1, 1, 4, 4) BUILTIN_TRANSFORMATION ("INTERNAL", "ANSI_X3.4-1968//", 1, "=INTERNAL->ascii", __gconv_transform_internal_ascii, NULL, 4, 4, 1, 1) |