Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
@@ -31,7 +31,7 @@ typedef struct {
unsigned char lc_messages_row;
} locale_entry;
-/* Need to include this before locale.h and xlocale.h! */
+/* Need to include this before locale.h! */
#include <bits/uClibc_locale.h>
#undef CODESET_LIST
@@ -36,10 +36,6 @@
#include <assert.h>
#include <locale.h>
-#ifdef __UCLIBC_HAS_XLOCALE__
-# include <xlocale.h>
-#endif
-
/**********************************************************************/
#ifdef __UCLIBC_HAS_CTYPE_TABLES__
@@ -85,19 +85,17 @@
#endif
#define CODESET_LIST (__locale_mmap->codeset_list)
#ifdef __UCLIBC_HAS_XLOCALE__
-#include <xlocale.h>
#else /* __UCLIBC_HAS_XLOCALE__ */
/* We need this internally... */
#define __UCLIBC_HAS_XLOCALE__ 1
#undef __UCLIBC_HAS_XLOCALE__
#endif /* __UCLIBC_HAS_XLOCALE__ */
@@ -149,10 +149,6 @@
#ifdef __UCLIBC_HAS_WCHAR__
#include <wchar.h>
#ifndef __isleap
#define __isleap(y) ( !((y) % 4) && ( ((y) % 100) || !((y) % 400) ) )
@@ -41,10 +41,6 @@
# error xlocale functionality is not supported in stub locale mode.
/* We know wide char support is enabled. We wouldn't be here otherwise. */
/* Define this if you want to unify the towupper and towlower code in the
@@ -112,10 +112,6 @@
# include <bits/uClibc_uwchar.h>
/* Handle _STRTOD_HEXADECIMAL_FLOATS via uClibc config now. */
#undef _STRTOD_HEXADECIMAL_FLOATS
#ifdef __UCLIBC_HAS_HEXADECIMAL_FLOATS__
@@ -100,10 +100,6 @@
#include <wctype.h>
#include <bits/uClibc_uwchar.h>
-#endif /* __UCLIBC_HAS_XLOCALE__ */
/* TODO: clean up the following... */
#if WCHAR_MAX > 0xffffUL