4 files changed, 1 insertions, 12 deletions
diff --git a/newlib/libc/locale/lmessages.c b/newlib/libc/locale/lmessages.c
index 9fb1df4a9..33a4a5a21 100644
--- a/newlib/libc/locale/lmessages.c
+++ b/newlib/libc/locale/lmessages.c
@@ -35,9 +35,7 @@
 #define LCMESSAGES_SIZE_MIN \
 		(offsetof(struct lc_messages_T, yesstr) / sizeof(char *))
 
-#ifndef __CYGWIN__
 static char empty[] = "";
-#endif
 
 static const struct lc_messages_T _C_messages_locale = {
 	"^[yY]" ,	/* yesexpr */
diff --git a/newlib/libc/locale/lmonetary.c b/newlib/libc/locale/lmonetary.c
index 80c2d0442..f1101a902 100644
--- a/newlib/libc/locale/lmonetary.c
+++ b/newlib/libc/locale/lmonetary.c
@@ -79,7 +79,6 @@ static struct lc_monetary_T _monetary_locale;
 static int	_monetary_using_locale;
 static char	*_monetary_locale_buf;
 
-#ifndef __CYGWIN__
 static char
 cnv(const char *str) {
 	int i = strtol(str, NULL, 10);
@@ -87,7 +86,6 @@ cnv(const char *str) {
 		i = CHAR_MAX;
 	return (char)i;
 }
-#endif
 
 int
 __monetary_load_locale(const char *name , void *f_wctomb, const char *charset)
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 8e2b121bc..ee24872b2 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -188,11 +188,7 @@ No supporting OS subroutines are required.
 #define _LC_LAST      7
 #define ENCODING_LEN 31
 
-#ifdef __CYGWIN__ /* Cygwin starts with LC_CTYPE set to "C.UTF-8". */
-int __EXPORT __mb_cur_max = 6;
-#else
 int __EXPORT __mb_cur_max = 1;
-#endif
 
 int __nlocale_changed = 0;
 int __mlocale_changed = 0;
diff --git a/newlib/libc/locale/nl_langinfo.c b/newlib/libc/locale/nl_langinfo.c
index 4b7e983f0..392a7cbbb 100644
--- a/newlib/libc/locale/nl_langinfo.c
+++ b/newlib/libc/locale/nl_langinfo.c
@@ -182,10 +182,7 @@ char *
 _DEFUN(nl_langinfo, (item), 
        nl_item item) {
 
-   char *ret, *cs;
-#ifndef __CYGWIN__
-   char *s;
-#endif
+   char *ret, *s, *cs;
    static char *csym = NULL;
 #ifdef TRANSITION_PERIOD_HACK
    static char *cset = NULL;