diff options
| author | Kim F. Storm | 2006-03-22 22:47:32 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-03-22 22:47:32 +0000 |
| commit | 47021b111d00462106780480c6c690bb7f0d0ae3 (patch) | |
| tree | c6f30a45dd59110dd5704f52170ea36a8d39b820 /src | |
| parent | 5bd3b1b2da76eaccb84eb55caa2c2856025f9b3a (diff) | |
| download | emacs-47021b111d00462106780480c6c690bb7f0d0ae3.tar.gz emacs-47021b111d00462106780480c6c690bb7f0d0ae3.zip | |
Define aliases for append_glyph and produce_stretch_glyph
when `static' is defined to avoid name clash with those in xdisp.c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/term.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c index 2b44653b961..603305c8f17 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -1629,6 +1629,12 @@ term_get_fkeys_1 () | |||
| 1629 | Character Display Information | 1629 | Character Display Information |
| 1630 | ***********************************************************************/ | 1630 | ***********************************************************************/ |
| 1631 | 1631 | ||
| 1632 | /* Avoid name clash with functions defined in xterm.c */ | ||
| 1633 | #ifdef static | ||
| 1634 | #define append_glyph append_glyph_term | ||
| 1635 | #define produce_stretch_glyph produce_stretch_glyph_term | ||
| 1636 | #endif | ||
| 1637 | |||
| 1632 | static void append_glyph P_ ((struct it *)); | 1638 | static void append_glyph P_ ((struct it *)); |
| 1633 | static void produce_stretch_glyph P_ ((struct it *)); | 1639 | static void produce_stretch_glyph P_ ((struct it *)); |
| 1634 | 1640 | ||