From 2a31a70ef169cfc1709dd2297fe123386e9db932 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 6 Jan 2006 17:35:50 +0000 Subject: Allow to build gcc/libstdc++ w/ LOCALE enabled, XLOCALE probably won't work though --- libc/sysdeps/linux/common/bits/uClibc_locale.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libc/sysdeps/linux') diff --git a/libc/sysdeps/linux/common/bits/uClibc_locale.h b/libc/sysdeps/linux/common/bits/uClibc_locale.h index fe52834e6..fe574170f 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_locale.h +++ b/libc/sysdeps/linux/common/bits/uClibc_locale.h @@ -67,7 +67,7 @@ /**********************************************************************/ #ifndef __LOCALE_C_ONLY -#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) +#if defined _LIBC /* && (defined IS_IN_libc || defined NOT_IN_libc) */ #include #include #include @@ -100,7 +100,7 @@ enum { * In particular, C/POSIX locale is '#' + "\x80\x01"}*LC_ALL + nul. */ -#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) && !defined __UCLIBC_GEN_LOCALE +#if defined _LIBC && !defined __UCLIBC_GEN_LOCALE /* && (defined IS_IN_libc || defined NOT_IN_libc) */ typedef struct { uint16_t num_weights; uint16_t num_starters; @@ -322,6 +322,7 @@ extern struct __uclibc_locale_struct * __global_locale; typedef struct __uclibc_locale_struct *__locale_t; +/* if we need to leave only _LIBC, then attribute_hidden is not usable */ #if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) extern int __locale_mbrtowc_l(wchar_t *__restrict dst, const char *__restrict src, -- cgit v1.2.3