|
@@ -67,7 +67,7 @@
|
|
/**********************************************************************/
|
|
/**********************************************************************/
|
|
#ifndef __LOCALE_C_ONLY
|
|
#ifndef __LOCALE_C_ONLY
|
|
|
|
|
|
-#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
|
|
|
|
|
|
+#if defined _LIBC /* && (defined IS_IN_libc || defined NOT_IN_libc) */
|
|
#include <stddef.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <stdint.h>
|
|
#include <bits/uClibc_touplow.h>
|
|
#include <bits/uClibc_touplow.h>
|
|
@@ -100,7 +100,7 @@ enum {
|
|
* In particular, C/POSIX locale is '#' + "\x80\x01"}*LC_ALL + nul.
|
|
* In particular, C/POSIX locale is '#' + "\x80\x01"}*LC_ALL + nul.
|
|
*/
|
|
*/
|
|
|
|
|
|
-#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) && !defined __UCLIBC_GEN_LOCALE
|
|
|
|
|
|
+#if defined _LIBC && !defined __UCLIBC_GEN_LOCALE /* && (defined IS_IN_libc || defined NOT_IN_libc) */
|
|
typedef struct {
|
|
typedef struct {
|
|
uint16_t num_weights;
|
|
uint16_t num_weights;
|
|
uint16_t num_starters;
|
|
uint16_t num_starters;
|
|
@@ -322,6 +322,7 @@ extern struct __uclibc_locale_struct * __global_locale;
|
|
|
|
|
|
typedef struct __uclibc_locale_struct *__locale_t;
|
|
typedef struct __uclibc_locale_struct *__locale_t;
|
|
|
|
|
|
|
|
+/* if we need to leave only _LIBC, then attribute_hidden is not usable */
|
|
#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
|
|
#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
|
|
extern int __locale_mbrtowc_l(wchar_t *__restrict dst,
|
|
extern int __locale_mbrtowc_l(wchar_t *__restrict dst,
|
|
const char *__restrict src,
|
|
const char *__restrict src,
|