From: Bruno Haible <bruno@clisp.org>
Date: Sun, 20 Jun 2021 01:47:20 +0000 (+0200)
Subject: Improve conflict resolution between gnulib and textstyle.h.
X-Git-Tag: v0.21.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b1c1784185bc9dce401bfef44119a0a3370ae2;p=thirdparty%2Fgettext.git

Improve conflict resolution between gnulib and textstyle.h.

* libtextstyle/lib/textstyle.h (libtextstyle_isatty): Don't override a Gnulib
override.
---

diff --git a/libtextstyle/lib/textstyle.h b/libtextstyle/lib/textstyle.h
index c1b381db7..121abe095 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 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
@@ -614,9 +614,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
 }