summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2020-09-12 10:11:26 +0300
committerEli Zaretskii <eliz@gnu.org>2020-09-12 10:11:26 +0300
commit694acda5f24e356264c3f2a55a49812e02bcb49a (patch)
tree5059bee86774b423a683f87c49ca055f5c658e85 /src
parentf3373901e5cc6c198cc36af29f9e2f64402f3e9e (diff)
downloademacs-694acda5f24e356264c3f2a55a49812e02bcb49a.tar.gz
Fix compilation on TERMINFO platforms with GCC 10
* src/terminfo.c [TERMINFO]: Don't redefine UP, BC, and CP, as that could cause linking errors due to multiple definitions. (Bug#43195)
Diffstat (limited to 'src')
-rw-r--r--src/terminfo.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/terminfo.c b/src/terminfo.c
index 51fd32e9e01..0765996401f 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -23,9 +23,12 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
/* Define these variables that serve as global parameters to termcap,
so that we do not need to conditionalize the places in Emacs
- that set them. */
+ that set them. But don't do that for terminfo, as that could
+ cause link errors when using -fno-common. */
+#if !TERMINFO
char *UP, *BC, PC;
+#endif
/* Interface to curses/terminfo library.
Turns out that all of the terminfo-level routines look