diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-06-20 03:47:20 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-06-20 18:37:03 +0200 |
| commit | 10faa7ec47994d90ec65da50d3ccdbc4a7cafdaa (patch) | |
| tree | e7cf415dbf1e9242eacc14d6ea858db120072815 /libtextstyle | |
| parent | c84028b46a291c99719309e63b3cb3cf23561ead (diff) | |
| download | gettext-10faa7ec47994d90ec65da50d3ccdbc4a7cafdaa.tar.gz | |
Improve conflict resolution between gnulib and textstyle.h.
* libtextstyle/lib/textstyle.h (libtextstyle_isatty): Don't override a Gnulib
override.
Diffstat (limited to 'libtextstyle')
| -rw-r--r-- | libtextstyle/lib/textstyle.h | 8 |
1 files changed, 5 insertions, 3 deletions
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 } |