mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-27 01:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve conflict resolution between gnulib and textstyle.h.

Browse Source 
* libtextstyle/lib/textstyle.h (libtextstyle_isatty): Don't override a Gnulib
override.
This commit is contained in:
Bruno Haible 2021-06-20 03:47:20 +02:00
parent c84028b46a
commit 10faa7ec47
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libtextstyle/lib/textstyle.h
View File

@ -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
}