2014-05-01 Steve Ellcey <sellcey@mips.com>

	* intl/iconv/skeleton.c (ONE_DIRECTION): Remove define.
	* iconv/gconv_simple.c (ONE_DIRECTION): Define.
	* iconvdata/8bit-gap.c (ONE_DIRECTION): Ditto.
	* iconvdata/8bit-generic.c (ONE_DIRECTION): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 4a13b225991531bc5a9dd057e709e8ee726de4a3..08ec932dde63d5819ab0e305baf5894735bf8043 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-01  Steve Ellcey  <sellcey@mips.com>
+
+       * intl/iconv/skeleton.c (ONE_DIRECTION): Remove define.
+       * iconv/gconv_simple.c (ONE_DIRECTION): Define.
+       * iconvdata/8bit-gap.c (ONE_DIRECTION): Ditto.
+       * iconvdata/8bit-generic.c (ONE_DIRECTION): Ditto.
+
 2014-05-01  Steve Ellcey  <sellcey@mips.com>
 
        * stdlib/longlong.h: Updated from GCC.

diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index f357713d9381d7815acd744cc55250c75c7b94fc..4ed45052e4d2d100a1e83e522578ca2475553049 100644 (file)
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -68,6 +68,7 @@ __gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c)
 #define FROM_LOOP              internal_ucs4_loop
 #define TO_LOOP                        internal_ucs4_loop /* This is not used.  */
 #define FUNCTION_NAME          __gconv_transform_internal_ucs4
+#define ONE_DIRECTION          0
 
 
 static inline int
@@ -222,6 +223,7 @@ internal_ucs4_loop_single (struct __gconv_step *step,
 #define FROM_LOOP              ucs4_internal_loop
 #define TO_LOOP                        ucs4_internal_loop /* This is not used.  */
 #define FUNCTION_NAME          __gconv_transform_ucs4_internal
+#define ONE_DIRECTION          0
 
 
 static inline int
@@ -433,6 +435,7 @@ ucs4_internal_loop_single (struct __gconv_step *step,
 #define FROM_LOOP              internal_ucs4le_loop
 #define TO_LOOP                        internal_ucs4le_loop /* This is not used.  */
 #define FUNCTION_NAME          __gconv_transform_internal_ucs4le
+#define ONE_DIRECTION          0
 
 
 static inline int
@@ -590,6 +593,7 @@ internal_ucs4le_loop_single (struct __gconv_step *step,
 #define FROM_LOOP              ucs4le_internal_loop
 #define TO_LOOP                        ucs4le_internal_loop /* This is not used.  */
 #define FUNCTION_NAME          __gconv_transform_ucs4le_internal
+#define ONE_DIRECTION          0
 
 
 static inline int

diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 19089493b573ba2bacac73c6cefa86c211a8c81f..73dc1860a9586942ab5879d50134d65bb18178bf 100644 (file)
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -163,11 +163,6 @@
 # endif
 #endif
 
-#ifndef ONE_DIRECTION
-# define ONE_DIRECTION 0
-#endif
-
-
 /* How many bytes are needed at most for the from-charset.  */
 #ifndef MAX_NEEDED_FROM
 # define MAX_NEEDED_FROM       MIN_NEEDED_FROM

diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index b33a6eafdbc76c4526137dda2561f204827f08d1..3bd7149df0b2b25c7b5c9bb24bace92e7d569364 100644 (file)
--- a/iconvdata/8bit-gap.c
+++ b/iconvdata/8bit-gap.c
@@ -42,6 +42,7 @@ struct gap
 #define DEFINE_FINI            1
 #define MIN_NEEDED_FROM                1
 #define MIN_NEEDED_TO          4
+#define ONE_DIRECTION          0
 
 
 /* First define the conversion function from the 8bit charset to UCS4.  */

diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c
index 20066aa5006ab2d7d5a49e4e2df652c0c5f62762..efc0fd5613e2f65bdf21e414ef5b6f303620599c 100644 (file)
--- a/iconvdata/8bit-generic.c
+++ b/iconvdata/8bit-generic.c
@@ -26,6 +26,7 @@
 #define DEFINE_FINI            1
 #define MIN_NEEDED_FROM                1
 #define MIN_NEEDED_TO          4
+#define ONE_DIRECTION          0
 
 
 /* First define the conversion function from the 8bit charset to UCS4.  */