diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-03 00:37:29 +0100 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-03 18:22:51 +0100 |
| commit | 152e66242f2af7cd26e29d59a31f8bb8479595e5 (patch) | |
| tree | 1c2f688b125cf12c61401fc07eef84c8a4d51442 /include/xlocale.h | |
| parent | 587d7092180a5f2053906b87ea2b25b2bf6b34c6 (diff) | |
update some headers
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Diffstat (limited to 'include/xlocale.h')
| -rw-r--r-- | include/xlocale.h | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/include/xlocale.h b/include/xlocale.h index 51a787f14..e3def347d 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. @@ -21,15 +21,6 @@ #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 - -#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 +28,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; - - struct __uclibc_locale_struct *__locale_ptr; + const unsigned short int *__ctype_b; + const int *__ctype_tolower; + const int *__ctype_toupper; -#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 */ |