diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-03-28 22:24:59 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-03-28 22:24:59 +0000 |
| commit | f4b59fd62358f28e23bae2fa8756913fd758299a (patch) | |
| tree | aa78d41676b17cfae0c8cd3c77e0004a4c946a5e /libc/stdio-common | |
| parent | 11e8a843c1be2bfbacb427ca25282e6979ebb48f (diff) | |
| download | eglibc2-f4b59fd62358f28e23bae2fa8756913fd758299a.tar.gz | |
Merge changes between r17700 and r17813 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17814 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/stdio-common')
| -rw-r--r-- | libc/stdio-common/_itowa.c | 2 | ||||
| -rw-r--r-- | libc/stdio-common/_itowa.h | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libc/stdio-common/_itowa.c b/libc/stdio-common/_itowa.c index 1ebc712b4..9381d33b6 100644 --- a/libc/stdio-common/_itowa.c +++ b/libc/stdio-common/_itowa.c @@ -85,7 +85,7 @@ extern const wchar_t _itowa_lower_digits[] attribute_hidden; extern const wchar_t _itowa_upper_digits[] attribute_hidden; -#if LLONG_MAX != LONG_MAX +#if _ITOA_NEEDED wchar_t * _itowa (value, buflim, base, upper_case) unsigned long long int value; diff --git a/libc/stdio-common/_itowa.h b/libc/stdio-common/_itowa.h index 0f3331144..aa349573f 100644 --- a/libc/stdio-common/_itowa.h +++ b/libc/stdio-common/_itowa.h @@ -20,6 +20,7 @@ #define _ITOWA_H 1 #include <features.h> #include <wchar.h> +#include <_itoa.h> /* Convert VALUE into ASCII in base BASE (2..36). Write backwards starting the character just before BUFLIM. @@ -31,7 +32,7 @@ extern wchar_t *_itowa (unsigned long long int value, wchar_t *buflim, static inline wchar_t * __attribute__ ((unused, always_inline)) -_itowa_word (unsigned long value, wchar_t *buflim, +_itowa_word (_ITOA_WORD_TYPE value, wchar_t *buflim, unsigned int base, int upper_case) { extern const wchar_t _itowa_upper_digits[] attribute_hidden; @@ -61,4 +62,10 @@ _itowa_word (unsigned long value, wchar_t *buflim, } #undef SPECIAL +#if !_ITOA_NEEDED +/* No need for special long long versions. */ +# define _itowa(value, buf, base, upper_case) \ + _itowa_word (value, buf, base, upper_case) +#endif + #endif /* itowa.h */ |