[COMMIT] Fix the Windows build

Aidan Kehoe kehoea at parhasard.net
Mon Nov 6 14:40:53 EST 2006


APPROVE COMMIT

NOTE: This patch has been committed.

src/ChangeLog addition:

2006-11-06  Aidan Kehoe  <kehoea at parhasard.net>

	* mule-charset.c (Fmake_charset):
	* objects-msw.c (mswindows_font_spec_matches_charset):
	* specifier.c (syms_of_specifier):
	Three changes to prevent the build dying with MSVC--thank you
	Vin. 
	

XEmacs Trunk source patch:
Diff command:   cvs -q diff -Nu
Files affected: src/specifier.c
===================================================================
RCS src/objects-msw.c
===================================================================
RCS src/mule-charset.c
===================================================================
RCS

Index: src/mule-charset.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v
retrieving revision 1.48
diff -u -u -r1.48 mule-charset.c
--- src/mule-charset.c	2006/11/05 22:31:44	1.48
+++ src/mule-charset.c	2006/11/06 19:30:59
@@ -554,7 +554,7 @@
 
 	    CHECK_STRING (value);
 	    quoted_registry = Fregexp_quote(value);
-	    if (strcmp(XSTRING_DATA(quoted_registry),
+	    if (qxestrcmp(XSTRING_DATA(quoted_registry),
 		       XSTRING_DATA(value)))
 	      {
 		warn_when_safe 
Index: src/objects-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-msw.c,v
retrieving revision 1.48
diff -u -u -r1.48 objects-msw.c
--- src/objects-msw.c	2006/11/05 22:31:44	1.48
+++ src/objects-msw.c	2006/11/06 19:31:02
@@ -2167,7 +2167,7 @@
 				     const Ibyte *nonreloc,
 				     Lisp_Object reloc,
 				     Bytecount offset, Bytecount length,
-				     int stage)
+				     enum font_specifier_matchspec_stages stage)
 {
   return stage ?
      mswindows_font_spec_matches_charset_stage_2 (d, charset, nonreloc,
Index: src/specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.45
diff -u -u -r1.45 specifier.c
--- src/specifier.c	2006/11/05 22:31:46	1.45
+++ src/specifier.c	2006/11/06 19:31:08
@@ -3809,7 +3809,9 @@
   DEFSUBR (Fcanonicalize_tag_set);
   DEFSUBR (Fdevice_matches_specifier_tag_set_p);
   DEFSUBR (Fdefine_specifier_tag);
+#ifdef DEBUG_XEMACS
   DEFSUBR (Fdevice_matching_specifier_tag_list);
+#endif /* DEBUG_XEMACS */
   DEFSUBR (Fspecifier_tag_list);
   DEFSUBR (Fspecifier_tag_device_predicate);
   DEFSUBR (Fspecifier_tag_charset_predicate);

-- 
Santa Maradona, priez pour moi!



More information about the XEmacs-Patches mailing list