diff options
| author | Eli Zaretskii | 2020-09-12 10:11:26 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-09-12 10:11:26 +0300 |
| commit | 694acda5f24e356264c3f2a55a49812e02bcb49a (patch) | |
| tree | 5059bee86774b423a683f87c49ca055f5c658e85 /src | |
| parent | f3373901e5cc6c198cc36af29f9e2f64402f3e9e (diff) | |
| download | emacs-694acda5f24e356264c3f2a55a49812e02bcb49a.tar.gz emacs-694acda5f24e356264c3f2a55a49812e02bcb49a.zip | |
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.c | 5 |
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/>. */ | |||
| 23 | 23 | ||
| 24 | /* Define these variables that serve as global parameters to termcap, | 24 | /* Define these variables that serve as global parameters to termcap, |
| 25 | so that we do not need to conditionalize the places in Emacs | 25 | so that we do not need to conditionalize the places in Emacs |
| 26 | that set them. */ | 26 | that set them. But don't do that for terminfo, as that could |
| 27 | cause link errors when using -fno-common. */ | ||
| 27 | 28 | ||
| 29 | #if !TERMINFO | ||
| 28 | char *UP, *BC, PC; | 30 | char *UP, *BC, PC; |
| 31 | #endif | ||
| 29 | 32 | ||
| 30 | /* Interface to curses/terminfo library. | 33 | /* Interface to curses/terminfo library. |
| 31 | Turns out that all of the terminfo-level routines look | 34 | Turns out that all of the terminfo-level routines look |