Mercurial > gnulib
changeset 39377:d4f5e651f17c
Support selective inclusion mechanism of recent mingw.org header files.
Reported by Eli Zaretskii <eliz@gnu.org>.
* lib/sys_types.in.h: On mingw, when __need_off_t, __need___off64_t,
__need_ssize_t, or __need_time_t is defined, just include the system's
<sys/types.h>.
* lib/locale.in.h: On mingw, when __need_locale_t is defined, just
include the system's <locale.h>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 13 May 2018 22:20:13 +0200 |
| parents | f935df9cb366 |
| children | a24cbc969ed9 |
| files | ChangeLog lib/locale.in.h lib/sys_types.in.h |
| diffstat | 3 files changed, 29 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 13 21:33:48 2018 +0200 +++ b/ChangeLog Sun May 13 22:20:13 2018 +0200 @@ -1,3 +1,13 @@ +2018-05-13 Bruno Haible <bruno@clisp.org> + + Support selective inclusion mechanism of recent mingw.org header files. + Reported by Eli Zaretskii <eliz@gnu.org>. + * lib/sys_types.in.h: On mingw, when __need_off_t, __need___off64_t, + __need_ssize_t, or __need_time_t is defined, just include the system's + <sys/types.h>. + * lib/locale.in.h: On mingw, when __need_locale_t is defined, just + include the system's <locale.h>. + 2018-05-13 Bruno Haible <bruno@clisp.org> Avoid compilation error due to 'mmap' on Android.
--- a/lib/locale.in.h Sun May 13 21:33:48 2018 +0200 +++ b/lib/locale.in.h Sun May 13 22:20:13 2018 +0200 @@ -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 @@ #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) */
--- a/lib/sys_types.in.h Sun May 13 21:33:48 2018 +0200 +++ b/lib/sys_types.in.h Sun May 13 22:20:13 2018 +0200 @@ -20,6 +20,17 @@ #endif @PRAGMA_COLUMNS@ +#if defined _WIN32 && !defined __CYGWIN__ \ + && (defined __need_off_t || defined __need___off64_t \ + || defined __need_ssize_t || defined __need_time_t) + +/* Special invocation convention inside mingw header files. */ + +#@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ + +#else +/* Normal invocation convention. */ + #ifndef _@GUARD_PREFIX@_SYS_TYPES_H /* The include_next requires a split double-inclusion guard. */ @@ -92,3 +103,4 @@ #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */ #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */ +#endif /* __need_XXX */