diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
| commit | 650c20f1ca4e07591a727e1cfcc74b3363d15985 (patch) | |
| tree | 85d11f6437cde22f410c25e0e5f71a3131ebd07d /src/terminfo.c | |
| parent | 8869332684c2302b5ba1ead4568bbc7ba1c0183e (diff) | |
| parent | 4b85ae6a24380fb67a3315eaec9233f17a872473 (diff) | |
| download | emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.gz emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.bz2 emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.zip | |
Merge 'master' into noverlay
Diffstat (limited to 'src/terminfo.c')
| -rw-r--r-- | src/terminfo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/terminfo.c b/src/terminfo.c index 046d00acee9..1a7b38d7d90 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -1,5 +1,5 @@ /* Interface from Emacs to terminfo. - Copyright (C) 1985-1986, 2001-2017 Free Software Foundation, Inc. + Copyright (C) 1985-1986, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -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 if terminfo defines them, as that + could cause link errors when using -fno-common. */ +#ifndef TERMINFO_DEFINES_BC char *UP, *BC, PC; +#endif /* Interface to curses/terminfo library. Turns out that all of the terminfo-level routines look |