changeset 3209:948bd302ca41

[xemacs-hg @ 2006-01-20 17:50:44 by crestani] Add cast to fix C++ build.
author crestani
date Fri, 20 Jan 2006 17:50:46 +0000
parents 7bef09f31fb7
children 72b7d685c194
files src/ChangeLog src/objects-x.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jan 19 22:51:07 2006 +0000
+++ b/src/ChangeLog	Fri Jan 20 17:50:46 2006 +0000
@@ -1,3 +1,7 @@
+2006-01-19  Marcus Crestani  <crestani@xemacs.org>
+
+	* objects-x.c (x_find_charset_font): Add cast to fix C++ build.
+
 2005-11-25  Mike Sperber  <mike@xemacs.org>
 
 	* nt.c (init_mswindows_environment): Add EMACSEARLYPACKAGES,
--- a/src/objects-x.c	Thu Jan 19 22:51:07 2006 +0000
+++ b/src/objects-x.c	Fri Jan 20 17:50:46 2006 +0000
@@ -1443,7 +1443,8 @@
       if (x_font_spec_matches_charset (XDEVICE (device), charset,
 				       intname, Qnil, 0, -1, 0))
 	{
-	  result = build_ext_string (intname, Qx_font_name_encoding); 
+	  result = build_ext_string ((const Extbyte *) intname, 
+				     Qx_font_name_encoding); 
 	  break;
 	}
     }