Browse Source

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>
Peter S. Mazinger 13 years ago
parent
commit
2a0c568ddc
2 changed files with 6 additions and 6 deletions
  1. 3 3
      include/locale.h
  2. 3 3
      include/xlocale.h

+ 3 - 3
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

+ 3 - 3
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 */