diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-08 23:15:22 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-08 23:15:22 +0200 |
| commit | 853c9cf3718db7c9f6d723e45031016231e1cbd1 (patch) | |
| tree | e6a5cafe819de3d14665da32bfd87259b089ec02 /gnulib-m4/locale-fr.m4 | |
| parent | 7b350538dddb27a4513158cb6b6405b85f175ad1 (diff) | |
| parent | 10bd216b0099d2ae8cb22c664fb725165096f95c (diff) | |
Merge branch 'release/debian/0.9.10-1'debian/0.9.10-1
Diffstat (limited to 'gnulib-m4/locale-fr.m4')
| -rw-r--r-- | gnulib-m4/locale-fr.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnulib-m4/locale-fr.m4 b/gnulib-m4/locale-fr.m4 index d974b035..a37a0d20 100644 --- a/gnulib-m4/locale-fr.m4 +++ b/gnulib-m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 18 -dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. +# locale-fr.m4 serial 19 +dnl Copyright (C) 2003, 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -31,7 +31,7 @@ int main () { return 1; #else /* Check whether the given locale name is recognized by the system. */ -# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if defined _WIN32 && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -160,7 +160,7 @@ int main () { variables, and all locales use the UTF-8 encoding. */ #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ -# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if defined _WIN32 && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE |