diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-30 01:14:23 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-30 01:14:23 +0000 |
commit | 6e46869a9c0c9f5e31378247e5835cd0b3301c96 (patch) | |
tree | dad4ede474ab46f074fd8381965d160f6a2ac92c /libc/stdlib/stdlib.c | |
parent | ca798b3b1e0937336dc382b6f3fe7453a219fd2f (diff) | |
download | uClibc-alpine-6e46869a9c0c9f5e31378247e5835cd0b3301c96.tar.bz2 uClibc-alpine-6e46869a9c0c9f5e31378247e5835cd0b3301c96.tar.xz |
Merge from trunk.
Diffstat (limited to 'libc/stdlib/stdlib.c')
-rw-r--r-- | libc/stdlib/stdlib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index a749955e2..eab6db24a 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -396,8 +396,10 @@ __XL_ALIAS(strtoull) /**********************************************************************/ #if defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) +#ifndef L__stdlib_strto_l #define L__stdlib_strto_l #endif +#endif #if defined(L__stdlib_strto_l) || defined(L__stdlib_strto_l_l) @@ -538,8 +540,10 @@ unsigned long __XL_NPP(_stdlib_strto_l)(register const Wchar * __restrict str, #endif /**********************************************************************/ #if defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) +#ifndef L__stdlib_strto_ll #define L__stdlib_strto_ll #endif +#endif #if defined(L__stdlib_strto_ll) || defined(L__stdlib_strto_ll_l) |