changeset 3662:b880e45ea63b

[xemacs-hg @ 2006-11-06 19:35:43 by aidan] Fix the Windows and non-DEBUG_XEMACS builds--thank you Vin.
author aidan
date Mon, 06 Nov 2006 19:35:45 +0000
parents 8fa1f807fc4e
children 51b2844aab96
files src/ChangeLog src/mule-charset.c src/objects-msw.c src/specifier.c
diffstat 4 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Nov 05 22:51:28 2006 +0000
+++ b/src/ChangeLog	Mon Nov 06 19:35:45 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-06  Aidan Kehoe  <kehoea@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 and with
+	DEBUG_XEMACS turned off--thank you Vin. 
+	
 2006-11-05  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* charset.h: 
--- a/src/mule-charset.c	Sun Nov 05 22:51:28 2006 +0000
+++ b/src/mule-charset.c	Mon Nov 06 19:35:45 2006 +0000
@@ -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 
--- a/src/objects-msw.c	Sun Nov 05 22:51:28 2006 +0000
+++ b/src/objects-msw.c	Mon Nov 06 19:35:45 2006 +0000
@@ -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,
--- a/src/specifier.c	Sun Nov 05 22:51:28 2006 +0000
+++ b/src/specifier.c	Mon Nov 06 19:35:45 2006 +0000
@@ -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);