diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-06-28 04:19:22 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-06-28 04:19:22 +0200 |
| commit | c4f76880e9589a757a194c19a4526599dfe71f50 (patch) | |
| tree | c66def0aa296e781c51dfc51c8bba9d8ac51189b /tests/locale.in.h | |
| parent | 76ef1d8e3249e82a6965fd17157bee00a7857ff3 (diff) | |
| parent | 7b65dbd4ebade81d504cfe5e681292a58ad1fdf0 (diff) | |
Update upstream source from tag 'upstream/0.9.10'
Update to upstream version '0.9.10'
with Debian dir 9736048cfd7ea97640dba10ba42a3839100c5694
Diffstat (limited to 'tests/locale.in.h')
| -rw-r--r-- | tests/locale.in.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/locale.in.h b/tests/locale.in.h index 1b27f1f..804261d 100644 --- a/tests/locale.in.h +++ b/tests/locale.in.h @@ -19,10 +19,13 @@ #endif @PRAGMA_COLUMNS@ -#ifdef _GL_ALREADY_INCLUDING_LOCALE_H +#if (defined _WIN32 && !defined __CYGWIN__ && defined __need_locale_t) \ + || defined _GL_ALREADY_INCLUDING_LOCALE_H -/* Special invocation conventions to handle Solaris header files - (through Solaris 10) when combined with gettext's libintl.h. */ +/* Special invocation convention: + - Inside mingw header files, + - To handle Solaris header files (through Solaris 10) when combined + with gettext's libintl.h. */ #@INCLUDE_NEXT@ @NEXT_LOCALE_H@ @@ -212,5 +215,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - " #endif #endif /* _@GUARD_PREFIX@_LOCALE_H */ -#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */ #endif /* _@GUARD_PREFIX@_LOCALE_H */ +#endif /* !(__need_locale_t || _GL_ALREADY_INCLUDING_LOCALE_H) */ |