From 10faa7ec47994d90ec65da50d3ccdbc4a7cafdaa Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Jun 2021 03:47:20 +0200 Subject: Improve conflict resolution between gnulib and textstyle.h. * libtextstyle/lib/textstyle.h (libtextstyle_isatty): Don't override a Gnulib override. --- libtextstyle/lib/textstyle.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libtextstyle') diff --git a/libtextstyle/lib/textstyle.h b/libtextstyle/lib/textstyle.h index 4ab09fdcf..ce0bf6e01 100644 --- a/libtextstyle/lib/textstyle.h +++ b/libtextstyle/lib/textstyle.h @@ -1,5 +1,5 @@ /* Public API of the libtextstyle library. - Copyright (C) 2006-2007, 2019-2020 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2019-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -690,9 +690,11 @@ extern void libtextstyle_set_failure_exit_code (int exit_code); extern "C" { # endif +# if !((defined isatty && defined _GL_UNISTD_H) || defined GNULIB_overrides_isatty) /* don't override gnulib */ extern int libtextstyle_isatty (int fd); -# undef isatty -# define isatty libtextstyle_isatty +# undef isatty +# define isatty libtextstyle_isatty +# endif # ifdef __cplusplus } -- cgit v1.2.1