aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2015-08-17 12:32:12 +0200
committerAndreas Schwab <schwab@suse.de>2016-03-07 17:47:50 +0100
commit8de3f8b2beb50bd85ba54e56bd48545d8ef09d2e (patch)
tree7b3cfd47fa87c2a9511e620012a5d2e5771ec676
parentf5e753c8c3a18a1e3c715dd11bf4dc341b5c481f (diff)
downloadglibc-8de3f8b2beb50bd85ba54e56bd48545d8ef09d2e.tar
glibc-8de3f8b2beb50bd85ba54e56bd48545d8ef09d2e.tar.gz
glibc-8de3f8b2beb50bd85ba54e56bd48545d8ef09d2e.tar.bz2
glibc-8de3f8b2beb50bd85ba54e56bd48545d8ef09d2e.zip
Fix min/max needed for ascii to INTERNAL conversion
-rw-r--r--ChangeLog5
-rw-r--r--iconv/gconv_builtin.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15f5389856..a2b99e4fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-07 Andreas Schwab <schwab@suse.de>
+
+ * iconv/gconv_builtin.h ("=ascii->INTERNAL"): Correct min/max
+ needed arguments.
+
2016-03-07 Hongjiu Zhang <noctuorare@gmail.com>
* elf/sln.c (makesymlink): Change struct stat to stat64, and lstat
diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h
index 856d0a9c6f..487aa73f5a 100644
--- a/iconv/gconv_builtin.h
+++ b/iconv/gconv_builtin.h
@@ -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)