169 lines
6.1 KiB
Diff
169 lines
6.1 KiB
Diff
--- origsrc/gettext-runtime/gnulib-lib/localename.c 2020-06-26 13:31:00.000000000 -0600
|
|
+++ src/gettext-runtime/gnulib-lib/localename.c 2021-07-26 22:46:33.473276900 -0600
|
|
@@ -79,7 +79,7 @@
|
|
# endif
|
|
#endif
|
|
|
|
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+#if defined WINDOWS_NATIVE /* Native Windows */
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <windows.h>
|
|
# include <winnls.h>
|
|
@@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name)
|
|
#endif
|
|
|
|
|
|
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+#if defined WINDOWS_NATIVE /* Native Windows */
|
|
|
|
/* Canonicalize a Windows native locale name to a Unix locale name.
|
|
NAME is a sufficiently large buffer.
|
|
@@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
|
|
Ignore invalid LANG value set by the Terminal application. */
|
|
if (strcmp (retval, "UTF-8") != 0)
|
|
#endif
|
|
-#if defined __CYGWIN__
|
|
- /* Cygwin.
|
|
- Ignore dummy LANG value set by ~/.profile. */
|
|
- if (strcmp (retval, "C.UTF-8") != 0)
|
|
-#endif
|
|
return retval;
|
|
}
|
|
|
|
@@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
|
|
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
|
*/
|
|
|
|
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
|
+#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
|
|
|
|
/* The system does not have a way of setting the locale, other than the
|
|
POSIX specified environment variables. We use C as default locale. */
|
|
@@ -3429,7 +3424,7 @@ gl_locale_name_default (void)
|
|
|
|
# endif
|
|
|
|
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+# if defined WINDOWS_NATIVE /* Native Windows */
|
|
{
|
|
LCID lcid;
|
|
|
|
--- origsrc/gettext-runtime/intl/localename.c 2020-06-26 16:05:00.000000000 -0600
|
|
+++ src/gettext-runtime/intl/localename.c 2021-07-26 22:46:33.473276900 -0600
|
|
@@ -79,7 +79,7 @@
|
|
# endif
|
|
#endif
|
|
|
|
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+#if defined WINDOWS_NATIVE_ /* Native Windows */
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <windows.h>
|
|
# include <winnls.h>
|
|
@@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name)
|
|
#endif
|
|
|
|
|
|
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+#if defined WINDOWS_NATIVE /* Native Windows */
|
|
|
|
/* Canonicalize a Windows native locale name to a Unix locale name.
|
|
NAME is a sufficiently large buffer.
|
|
@@ -3243,7 +3243,7 @@ gl_locale_name_thread (int category, con
|
|
However it does not specify the exact format. Neither do SUSV2 and
|
|
ISO C 99. So we can use this feature only on selected systems (e.g.
|
|
those using GNU C Library). */
|
|
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
|
|
+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
|
|
# define HAVE_LOCALE_NULL
|
|
#endif
|
|
|
|
@@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
|
|
Ignore invalid LANG value set by the Terminal application. */
|
|
if (strcmp (retval, "UTF-8") != 0)
|
|
#endif
|
|
-#if defined __CYGWIN__
|
|
- /* Cygwin.
|
|
- Ignore dummy LANG value set by ~/.profile. */
|
|
- if (strcmp (retval, "C.UTF-8") != 0)
|
|
-#endif
|
|
return retval;
|
|
}
|
|
|
|
@@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
|
|
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
|
*/
|
|
|
|
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
|
+#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
|
|
|
|
/* The system does not have a way of setting the locale, other than the
|
|
POSIX specified environment variables. We use C as default locale. */
|
|
@@ -3429,7 +3424,7 @@ gl_locale_name_default (void)
|
|
|
|
# endif
|
|
|
|
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+# if defined WINDOWS_NATIVE /* Native Windows */
|
|
{
|
|
LCID lcid;
|
|
|
|
--- origsrc/gettext-tools/gnulib-lib/localename.c 2020-06-26 13:57:00.000000000 -0600
|
|
+++ src/gettext-tools/gnulib-lib/localename.c 2021-07-26 22:46:33.473276900 -0600
|
|
@@ -79,7 +79,7 @@
|
|
# endif
|
|
#endif
|
|
|
|
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+#if defined WINDOWS_NATIVE_ /* Native Windows */
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <windows.h>
|
|
# include <winnls.h>
|
|
@@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name)
|
|
#endif
|
|
|
|
|
|
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+#if defined WINDOWS_NATIVE /* Native Windows */
|
|
|
|
/* Canonicalize a Windows native locale name to a Unix locale name.
|
|
NAME is a sufficiently large buffer.
|
|
@@ -3243,7 +3243,7 @@ gl_locale_name_thread (int category, con
|
|
However it does not specify the exact format. Neither do SUSV2 and
|
|
ISO C 99. So we can use this feature only on selected systems (e.g.
|
|
those using GNU C Library). */
|
|
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
|
|
+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
|
|
# define HAVE_LOCALE_NULL
|
|
#endif
|
|
|
|
@@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
|
|
Ignore invalid LANG value set by the Terminal application. */
|
|
if (strcmp (retval, "UTF-8") != 0)
|
|
#endif
|
|
-#if defined __CYGWIN__
|
|
- /* Cygwin.
|
|
- Ignore dummy LANG value set by ~/.profile. */
|
|
- if (strcmp (retval, "C.UTF-8") != 0)
|
|
-#endif
|
|
return retval;
|
|
}
|
|
|
|
@@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
|
|
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
|
*/
|
|
|
|
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
|
+#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
|
|
|
|
/* The system does not have a way of setting the locale, other than the
|
|
POSIX specified environment variables. We use C as default locale. */
|
|
@@ -3429,7 +3424,7 @@ gl_locale_name_default (void)
|
|
|
|
# endif
|
|
|
|
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|
|
+# if defined WINDOWS_NATIVE /* Native Windows */
|
|
{
|
|
LCID lcid;
|
|
|