From f349489e7e5b5341a9c1a590e9a41c2e07d3bdbb Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Thu, 31 Jul 2014 20:10:47 +0200 Subject: [PATCH] [PATCH] S390: Fix remaining ONE_DIRECTION warning messages This patch fixes the remaining ONE_DIRECTION warnings for s390 specific conversions. It defines ONE_DIRECTION to 0 like the patch from Steve Ellcey: https://www.sourceware.org/ml/libc-alpha/2014-05/msg00039.html Changelog: * sysdeps/s390/s390-64/utf16-utf32-z9.c (ONE_DIRECTION): Define. * sysdeps/s390/s390-64/utf8-utf16-z9.c (ONE_DIRECTION): Define. * sysdeps/s390/s390-64/utf8-utf32-z9.c (ONE_DIRECTION): Define. --- ChangeLog | 9 +++++++++ sysdeps/s390/s390-64/utf16-utf32-z9.c | 1 + sysdeps/s390/s390-64/utf8-utf16-z9.c | 1 + sysdeps/s390/s390-64/utf8-utf32-z9.c | 1 + 4 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index ac65fd0..de363a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2014-07-31 Stefan Liebler + * sysdeps/s390/s390-64/utf16-utf32-z9.c + (ONE_DIRECTION): Define. + * sysdeps/s390/s390-64/utf8-utf16-z9.c + (ONE_DIRECTION): Define. + * sysdeps/s390/s390-64/utf8-utf32-z9.c + (ONE_DIRECTION): Define. + +2014-07-31 Stefan Liebler + * sysdeps/s390/Makefile: Delete file. * sysdeps/s390/Versions (GLIBC_2.19): Remove __setjmp. * sysdeps/s390/__longjmp.c: Delete file. diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c index 11a098f..101f574 100644 --- a/sysdeps/s390/s390-64/utf16-utf32-z9.c +++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c @@ -44,6 +44,7 @@ #define FROM_LOOP from_utf16_loop #define TO_LOOP to_utf16_loop #define FROM_DIRECTION (dir == from_utf16) +#define ONE_DIRECTION 0 #define PREPARE_LOOP \ enum direction dir = ((struct utf16_data *) step->__data)->dir; \ int emit_bom = ((struct utf16_data *) step->__data)->emit_bom; \ diff --git a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c index 7475421..4155187 100644 --- a/sysdeps/s390/s390-64/utf8-utf16-z9.c +++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c @@ -42,6 +42,7 @@ #define FROM_LOOP from_utf8_loop #define TO_LOOP to_utf8_loop #define FROM_DIRECTION (dir == from_utf8) +#define ONE_DIRECTION 0 #define PREPARE_LOOP \ enum direction dir = ((struct utf8_data *) step->__data)->dir; \ int emit_bom = ((struct utf8_data *) step->__data)->emit_bom; \ diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c index cb74f34..3c0296e 100644 --- a/sysdeps/s390/s390-64/utf8-utf32-z9.c +++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c @@ -44,6 +44,7 @@ #define FROM_LOOP from_utf8_loop #define TO_LOOP to_utf8_loop #define FROM_DIRECTION (dir == from_utf8) +#define ONE_DIRECTION 0 #define PREPARE_LOOP \ enum direction dir = ((struct utf8_data *) step->__data)->dir; \ int emit_bom = ((struct utf8_data *) step->__data)->emit_bom; \ -- 2.7.4