diff options
| author | Steve Ellcey <sellcey@mips.com> | 2014-05-01 10:22:35 -0700 |
|---|---|---|
| committer | Steve Ellcey <sellcey@mips.com> | 2014-05-01 10:22:35 -0700 |
| commit | 0cdddc25a47509262a9a55a343395971b492b0fa (patch) | |
| tree | 581cc493d6ff8807ad824ff69d09fb55124b8e59 | |
| parent | 6426d77e47f011086dea324801e5c0a612455831 (diff) | |
| download | glibc-0cdddc25a47509262a9a55a343395971b492b0fa.tar.gz glibc-0cdddc25a47509262a9a55a343395971b492b0fa.tar.xz glibc-0cdddc25a47509262a9a55a343395971b492b0fa.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | iconv/gconv_simple.c | 4 | ||||
| -rw-r--r-- | iconv/skeleton.c | 5 | ||||
| -rw-r--r-- | iconvdata/8bit-gap.c | 1 | ||||
| -rw-r--r-- | iconvdata/8bit-generic.c | 1 |
5 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 4a13b22599..08ec932dde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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. 2014-05-01 Will Newton <will.newton@linaro.org> 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 diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c index b33a6eafdb..3bd7149df0 100644 --- 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 20066aa500..efc0fd5613 100644 --- 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. */ |