diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-04 18:28:26 +0100 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-04 18:28:26 +0100 |
| commit | 2a0c568ddc7b6b142dc049d8cc9cf32eb38e2321 (patch) | |
| tree | cff255aa00e3442acbc07d38424d6fc2db4994a7 | |
| parent | ad7e468ca0aefd1adfebc7a87c249ef330e2362d (diff) | |
fix locale build
make xlocale.h a dummy, locale_t is needed without it and
uClibc_locale.h is already included by locale.h
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
| -rw-r--r-- | include/locale.h | 6 | ||||
| -rw-r--r-- | include/xlocale.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/locale.h b/include/locale.h index fa8d9e2d8..d04c42ff6 100644 --- a/include/locale.h +++ b/include/locale.h @@ -145,13 +145,13 @@ __END_NAMESPACE_STD Attention: all these functions are *not* standardized in any form. This is a proof-of-concept implementation. */ -#if 0 +#ifdef __UCLIBC_HAS_XLOCALE__ /* Get locale datatype definition. */ # include <xlocale.h> -#else +#endif + /* POSIX 2008 makes locale_t official. */ typedef __locale_t locale_t; -#endif /* Return a reference to a data structure representing a set of locale datasets. Unlike for the CATEGORY parameter for `setlocale' the diff --git a/include/xlocale.h b/include/xlocale.h index e3def347d..82dabdfda 100644 --- a/include/xlocale.h +++ b/include/xlocale.h @@ -39,11 +39,11 @@ typedef struct __locale_struct /* Note: LC_ALL is not a valid index into this array. */ const char *__names[13]; } *__locale_t; -#else -# include <bits/uClibc_locale.h> -#endif /* POSIX 2008 makes locale_t official. */ typedef __locale_t locale_t; +#else +# include <locale.h> +#endif #endif /* xlocale.h */ |