From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Mon, 8 Jun 2009 04:40:17 +0000 (+0000)
Subject: nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring.
X-Git-Tag: emacs-pretest-23.0.95~114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7eb9816c82b389eb1e7915be531e379275d7df0;p=emacs.git

nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index dfffebc031d..197cfaf9070 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -23,6 +23,8 @@
 	(nsfont_draw): Handle "automatic" (lookup-table) compositions.
 	(dump_glyphstring): Rename to ns_dump_glyphstring.
 
+	* nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring.
+
 	* nsfns.m (Fns_popup_font_panel): Use shared font manager.
 
 	* fontset.c (fontset_from_font): Remove NS-specific code.
diff --git a/src/nsterm.h b/src/nsterm.h
index 392c79a278c..7375e3c9fc4 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -682,7 +682,7 @@ extern void nsfont_make_fontset_for_font (Lisp_Object name,
 
 /* In nsfont, for debugging */
 struct glyph_string;
-void dump_glyphstring (struct glyph_string *s);
+void ns_dump_glyphstring (struct glyph_string *s);
 
 /* Implemented in nsterm, published in or needed from nsfns. */
 extern Lisp_Object Qfontsize;