From: Kim F. Storm <storm@cua.dk>
Date: Wed, 22 Mar 2006 22:47:32 +0000 (+0000)
Subject: Define aliases for append_glyph and produce_stretch_glyph
X-Git-Tag: emacs-pretest-22.0.90~3461
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47021b111d00462106780480c6c690bb7f0d0ae3;p=emacs.git

Define aliases for append_glyph and produce_stretch_glyph
when `static' is defined to avoid name clash with those in xdisp.c.
---

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 ()
 		       Character Display Information
  ***********************************************************************/
 
+/* Avoid name clash with functions defined in xterm.c */
+#ifdef static
+#define append_glyph append_glyph_term
+#define produce_stretch_glyph produce_stretch_glyph_term
+#endif
+
 static void append_glyph P_ ((struct it *));
 static void produce_stretch_glyph P_ ((struct it *));