From: Bruno Haible Date: Sun, 20 Jun 2021 01:23:45 +0000 (+0200) Subject: unistd: Improve conflict resolution between gnulib and textstyle.h. X-Git-Tag: v1.0~2799 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=fa7147fdd9f2a6112b5256b034ddfed9b29d8b0f;p=gnulib.git unistd: Improve conflict resolution between gnulib and textstyle.h. * lib/unistd.in.h (GNULIB_overrides_isatty): New macro. --- diff --git a/ChangeLog b/ChangeLog index 188bdafc4e..da5b6316af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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. diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 35abbde7ae..d4d4ba7743 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__