From 0cdddc25a47509262a9a55a343395971b492b0fa Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Thu, 1 May 2014 10:22:35 -0700 Subject: 2014-05-01 Steve Ellcey * 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. --- iconv/gconv_simple.c | 4 ++++ iconv/skeleton.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'iconv') diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index f357713d93..4ed45052e4 100644 --- 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 19089493b5..73dc1860a9 100644 --- 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 -- cgit 1.4.1