summaryrefslogtreecommitdiff
path: root/tests/setlocale.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-06-28 04:18:55 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-06-28 04:18:55 +0200
commit7b65dbd4ebade81d504cfe5e681292a58ad1fdf0 (patch)
tree7f538708782712f993180dd6363e46bf0cfe8eaa /tests/setlocale.c
parentf7c3580478601e3a77dc864e5a1d91c1edad5187 (diff)
New upstream version 0.9.10upstream/0.9.10
Diffstat (limited to 'tests/setlocale.c')
-rw-r--r--tests/setlocale.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/setlocale.c b/tests/setlocale.c
index 5ac7f72..1ac3f4d 100644
--- a/tests/setlocale.c
+++ b/tests/setlocale.c
@@ -72,7 +72,7 @@ category_to_name (int category)
return retval;
}
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* The native Windows setlocale() function expects locale names of the form
"German" or "German_Germany" or "DEU", but not "de" or "de_DE". We need
@@ -635,7 +635,7 @@ setlocale_unixlike (int category, const char *locale)
/* The native Windows implementation of setlocale understands the special
locale name "C", but not "POSIX". Therefore map "POSIX" to "C". */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#if defined _WIN32 && !defined __CYGWIN__
if (locale != NULL && strcmp (locale, "POSIX") == 0)
locale = "C";
#endif
@@ -852,7 +852,7 @@ rpl_setlocale (int category, const char *locale)
if (setlocale_unixlike (LC_ALL, base_name) == NULL)
goto fail;
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
/* On native Windows, setlocale(LC_ALL,...) may succeed but set the
LC_CTYPE category to an invalid value ("C") when it does not
support the specified encoding. Report a failure instead. */
@@ -903,7 +903,7 @@ rpl_setlocale (int category, const char *locale)
}
else
{
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# if defined _WIN32 && ! defined __CYGWIN__
if (category == LC_ALL && locale != NULL && strchr (locale, '.') != NULL)
{
char *saved_locale;