diff options
Diffstat (limited to 'include/xlocale.h')
| -rw-r--r-- | include/xlocale.h | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/include/xlocale.h b/include/xlocale.h index 6f726fef9..8f5a740f5 100644 --- a/include/xlocale.h +++ b/include/xlocale.h @@ -1,5 +1,5 @@ /* Definition of locale datatype. - Copyright (C) 1997,2000,02 Free Software Foundation, Inc. + Copyright (C) 1997,2000,2002,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -14,22 +14,12 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifndef _XLOCALE_H #define _XLOCALE_H 1 -#include <features.h> - -#ifndef __UCLIBC_HAS_XLOCALE__ -#error Attempted to include xlocale.h when uClibc built without extended locale support. -#endif /* __UCLIBC_HAS_XLOCALE__ */ - -#include <bits/uClibc_locale.h> -/* #include <bits/uClibc_touplow.h> */ - #if 0 /* Structure for reentrant locale using functions. This is an (almost) opaque type for the user level programs. The file and @@ -37,26 +27,22 @@ go away without warning. */ typedef struct __locale_struct { -#if 0 /* Note: LC_ALL is not a valid index into this array. */ struct locale_data *__locales[13]; /* 13 = __LC_LAST. */ -#endif /* To increase the speed of this solution we add some special members. */ -/* const unsigned short int *__ctype_b; */ -/* const int *__ctype_tolower; */ -/* const int *__ctype_toupper; */ - const __uint16_t *__ctype_b; - const __ctype_touplow_t *__ctype_tolower; - const __ctype_touplow_t *__ctype_toupper; + const unsigned short int *__ctype_b; + const int *__ctype_tolower; + const int *__ctype_toupper; - __uclibc_locale_t *__locale_ptr; - -#if 0 /* Note: LC_ALL is not a valid index into this array. */ const char *__names[13]; -#endif } *__locale_t; +#else +# include <bits/uClibc_locale.h> #endif +/* POSIX 2008 makes locale_t official. */ +typedef __locale_t locale_t; + #endif /* xlocale.h */ |