From bb2512780405353b1f66ffe93483972b97d1aec9 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sat, 12 Mar 2011 20:41:33 +0100
Subject: do not include xlocale.h, it is included by locale.h when needed

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 extra/locale/programs/locale.c | 2 +-
 libc/misc/ctype/ctype.c        | 4 ----
 libc/misc/locale/locale.c      | 4 +---
 libc/misc/time/time.c          | 4 ----
 libc/misc/wctype/_wctype.c     | 4 ----
 libc/stdlib/_strtod.c          | 4 ----
 libc/stdlib/stdlib.c           | 4 ----
 7 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/extra/locale/programs/locale.c b/extra/locale/programs/locale.c
index dfd202954..c9fd1f3c2 100644
--- a/extra/locale/programs/locale.c
+++ b/extra/locale/programs/locale.c
@@ -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
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index 1c40b244a..a3e4cfc3f 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -36,10 +36,6 @@
 #include <assert.h>
 #include <locale.h>
 
-#ifdef __UCLIBC_HAS_XLOCALE__
-# include <xlocale.h>
-#endif
-
 /**********************************************************************/
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index e8fddf67c..7085629c4 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -85,19 +85,17 @@
 #endif
 #endif
 
-/* 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
 #define CODESET_LIST			(__locale_mmap->codeset_list)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-#include <xlocale.h>
 #include <locale.h>
 #else /* __UCLIBC_HAS_XLOCALE__ */
 /* We need this internally... */
 #define __UCLIBC_HAS_XLOCALE__ 1
-#include <xlocale.h>
 #include <locale.h>
 #undef __UCLIBC_HAS_XLOCALE__
 #endif /* __UCLIBC_HAS_XLOCALE__ */
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 534a7aa9a..ee1c0c532 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -149,10 +149,6 @@
 #ifdef __UCLIBC_HAS_WCHAR__
 #include <wchar.h>
 #endif
-#ifdef __UCLIBC_HAS_XLOCALE__
-#include <xlocale.h>
-#endif
-
 
 #ifndef __isleap
 #define __isleap(y) ( !((y) % 4) && ( ((y) % 100) || !((y) % 400) ) )
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c
index 89269f45e..54ac5ad4b 100644
--- a/libc/misc/wctype/_wctype.c
+++ b/libc/misc/wctype/_wctype.c
@@ -41,10 +41,6 @@
 # error xlocale functionality is not supported in stub locale mode.
 #endif
 
-#ifdef __UCLIBC_HAS_XLOCALE__
-# include <xlocale.h>
-#endif
-
 /* 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
diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c
index f468c7347..cc57d14b9 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -112,10 +112,6 @@
 # include <bits/uClibc_uwchar.h>
 #endif
 
-#ifdef __UCLIBC_HAS_XLOCALE__
-# include <xlocale.h>
-#endif
-
 /* Handle _STRTOD_HEXADECIMAL_FLOATS via uClibc config now. */
 #undef _STRTOD_HEXADECIMAL_FLOATS
 #ifdef __UCLIBC_HAS_HEXADECIMAL_FLOATS__
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index de8f084bd..ef33be308 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -100,10 +100,6 @@
 #include <wctype.h>
 #include <bits/uClibc_uwchar.h>
 
-#ifdef __UCLIBC_HAS_XLOCALE__
-#include <xlocale.h>
-#endif /* __UCLIBC_HAS_XLOCALE__ */
-
 /* TODO: clean up the following... */
 
 #if WCHAR_MAX > 0xffffUL
-- 
cgit v1.2.3