Mercurial > hg > xemacs-beta

changeset 4814:ae2e0c1c8fae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 08 Jan 2010 14:30:22 +0000
parents 5b560b7374ff (current diff) 6f84332672fb (diff)
children 6540302eedf5
files src/ChangeLog
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jan 08 14:20:14 2010 +0000
+++ b/src/ChangeLog	Fri Jan 08 14:30:22 2010 +0000
@@ -1,3 +1,9 @@
+2010-01-08  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* mule-charset.c (Fmake_charset): 
+	Change build_string with an Ibyte argument to build_intstring,
+	fixing the build on Visual C++. Thank you for the report, Vin.
+
 2010-01-07  Jerry James  <james@xemacs.org>
 
 	* font-mgr.c (Ffc_font_match): Initialize result to FcResultMatch
--- a/src/mule-charset.c	Fri Jan 08 14:20:14 2010 +0000
+++ b/src/mule-charset.c	Fri Jan 08 14:30:22 2010 +0000
@@ -627,7 +627,7 @@
       Ibyte tempname[80];
 
       qxesprintf (tempname, "___temporary___%d__", id);
-      name = Fmake_symbol (build_string (tempname)); /* Uninterned. */
+      name = Fmake_symbol (build_intstring (tempname)); /* Uninterned. */
     }
   if (NILP (doc_string))
     doc_string = build_string ("");