>From fa7147fdd9f2a6112b5256b034ddfed9b29d8b0f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Jun 2021 03:23:45 +0200 Subject: [PATCH 2/2] unistd: Improve conflict resolution between gnulib and textstyle.h. * lib/unistd.in.h (GNULIB_overrides_isatty): New macro. --- ChangeLog | 5 +++++ lib/unistd.in.h | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 188bdaf..da5b631 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2021-06-19 Bruno Haible + unistd: Improve conflict resolution between gnulib and textstyle.h. + * lib/unistd.in.h (GNULIB_overrides_isatty): New macro. + +2021-06-19 Bruno Haible + stdio: Improve conflict resolution between gnulib and libintl.h. * lib/stdio.in.h (GNULIB_overrides_snprintf, GNULIB_overrides_sprintf, GNULIB_overrides_asprintf, GNULIB_overrides_vasprintf, diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 35abbde..d4d4ba7 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " # undef isatty # define isatty rpl_isatty # endif +# define GNULIB_defined_isatty 1 _GL_FUNCDECL_RPL (isatty, int, (int fd)); _GL_CXXALIAS_RPL (isatty, int, (int fd)); # elif defined _WIN32 && !defined __CYGWIN__ -- 2.7.4