From: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Thu, 31 Jul 2014 18:10:47 +0000 (+0200)
Subject: [PATCH] S390: Fix remaining ONE_DIRECTION warning messages
X-Git-Tag: glibc-2.20~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f349489e7e5b5341a9c1a590e9a41c2e07d3bdbb;p=thirdparty%2Fglibc.git

[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.
---

diff --git a/ChangeLog b/ChangeLog
index ac65fd0b65f..de363a6009f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-31  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+	* 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  <stli@linux.vnet.ibm.com>
 
 	* sysdeps/s390/Makefile: Delete file.
diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
index 11a098fa99b..101f574fa10 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 74754211c12..4155187b97f 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 cb74f34075f..3c0296eaa7d 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;		\