From: Bruno Haible Date: Sat, 11 Aug 2018 18:23:37 +0000 (+0200) Subject: setlocale: Trivial simplification. X-Git-Tag: v1.0~5480 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1945403c96c533137ea6916ad5a220050d176fd0;p=gnulib.git setlocale: Trivial simplification. * lib/setlocale.c (setlocale_unixlike): Remove redundant #if. --- diff --git a/ChangeLog b/ChangeLog index 41a277175c..33b1c35e48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-11 Bruno Haible + + setlocale: Trivial simplification. + * lib/setlocale.c (setlocale_unixlike): Remove redundant #if. + 2018-08-11 Paul Eggert verify: port 'assume' to traditional tools diff --git a/lib/setlocale.c b/lib/setlocale.c index 1ac3f4d66e..ef5fb4c2a7 100644 --- a/lib/setlocale.c +++ b/lib/setlocale.c @@ -635,10 +635,8 @@ 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 __CYGWIN__ if (locale != NULL && strcmp (locale, "POSIX") == 0) locale = "C"; -#endif /* First, try setlocale with the original argument unchanged. */ result = setlocale (category, locale);