summaryrefslogtreecommitdiffstats
path: root/newlib/libc/locale/locale.c
diff options
context:
space:
mode:
Diffstat (limited to 'newlib/libc/locale/locale.c')
-rw-r--r--newlib/libc/locale/locale.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 24d285bf7..e93f78021 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -149,11 +149,7 @@ No supporting OS subroutines are required.
#define _LC_LAST 7
#define ENCODING_LEN 31
-#ifdef __CYGWIN__
-int __declspec(dllexport) __mb_cur_max = 1;
-#else
-int __mb_cur_max = 1;
-#endif
+int __EXPORT __mb_cur_max = 1;
int __nlocale_changed = 0;
int __mlocale_changed = 0;
@@ -377,9 +373,10 @@ currentlocale()
#ifdef _MB_CAPABLE
#ifdef __CYGWIN__
extern void *__set_charset_from_codepage (unsigned int, char *charset);
-extern void __set_ctype (const char *charset);
#endif /* __CYGWIN__ */
+extern void __set_ctype (const char *charset);
+
static char *
loadlocale(struct _reent *p, int category)
{
@@ -604,10 +601,8 @@ loadlocale(struct _reent *p, int category)
#ifdef _MB_CAPABLE
__wctomb = l_wctomb;
__mbtowc = l_mbtowc;
-#ifdef __CYGWIN__
__set_ctype (charset);
#endif
-#endif
}
else if (category == LC_MESSAGES)
strcpy (lc_message_charset, charset);