# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1263433396 21600
# Node ID d35e231d347da80e41cb04aea9bf445c8cba310c
# Parent  e0138eaaca0ce836d4528d3ba48dbe86820361fb
fix build problems

-------------------- ChangeLog entries follow: --------------------

src/ChangeLog addition:

2010-01-13  Ben Wing  <ben@xemacs.org>

	* specifier.c (specifier_instance_from_inst_list):
	Don't declare an unused variable, (void) 0 is enough.

	* text.h:
	Don't use USED_IF_MULE_OR_CHECK_TEXT().

diff -r e0138eaaca0c -r d35e231d347d src/ChangeLog
--- a/src/ChangeLog	Wed Jan 13 13:30:17 2010 -0600
+++ b/src/ChangeLog	Wed Jan 13 19:43:16 2010 -0600
@@ -1,3 +1,11 @@
+2010-01-13  Ben Wing  <ben@xemacs.org>
+
+	* specifier.c (specifier_instance_from_inst_list):
+	Don't declare an unused variable, (void) 0 is enough.
+	
+	* text.h:
+	Don't use USED_IF_MULE_OR_CHECK_TEXT().
+
 2010-01-13  Ben Wing  <ben@xemacs.org>
 
 	* debug.c (vars_of_debug):
diff -r e0138eaaca0c -r d35e231d347d src/specifier.c
--- a/src/specifier.c	Wed Jan 13 13:30:17 2010 -0600
+++ b/src/specifier.c	Wed Jan 13 19:43:16 2010 -0600
@@ -2813,9 +2813,6 @@
   int count = specpdl_depth (), respected_charsets = 0;
   struct gcpro gcpro1, gcpro2;
   enum font_specifier_matchspec_stages stage = initial;
-#ifdef DEBUG_XEMACS
-  int non_ascii;
-#endif
 
   GCPRO2 (specifier, inst_list);
 
@@ -2838,9 +2835,9 @@
 
 #ifdef DEBUG_XEMACS
       /* This is mostly to have somewhere to set debug breakpoints. */
-      if (!EQ(charset, Vcharset_ascii))
+      if (!EQ (charset, Vcharset_ascii))
 	{
-	  non_ascii = 1;
+	  (void) 0;
 	}
 #endif /* DEBUG_XEMACS */
 
diff -r e0138eaaca0c -r d35e231d347d src/text.h
--- a/src/text.h	Wed Jan 13 13:30:17 2010 -0600
+++ b/src/text.h	Wed Jan 13 19:43:16 2010 -0600
@@ -770,8 +770,7 @@
      
 DECLARE_INLINE_HEADER (
 Bytecount
-itext_ichar_len_fmt (const Ibyte *USED_IF_MULE_OR_CHECK_TEXT (ptr),
-		     Internal_Format fmt)
+itext_ichar_len_fmt (const Ibyte *ptr, Internal_Format fmt)
 )
 {
   switch (fmt)
@@ -1059,8 +1058,7 @@
 /* Convert a byte index into a string into a char index. */
 DECLARE_INLINE_HEADER (
 Charcount
-string_index_byte_to_char (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s),
-			   Bytecount idx)
+string_index_byte_to_char (Lisp_Object s, Bytecount idx)
 )
 {
   Charcount retval;
@@ -1087,8 +1085,7 @@
 /* Convert a char index into a string into a byte index. */
 DECLARE_INLINE_HEADER (
 Bytecount
-string_index_char_to_byte (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s),
-			   Charcount idx)
+string_index_char_to_byte (Lisp_Object s, Charcount idx)
 )
 {
   Bytecount retval;
@@ -1115,9 +1112,7 @@
    chars. */
 DECLARE_INLINE_HEADER (
 Charcount
-string_offset_byte_to_char_len (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s),
-				Bytecount USED_IF_MULE_OR_CHECK_TEXT (off),
-				Bytecount len)
+string_offset_byte_to_char_len (Lisp_Object s, Bytecount off, Bytecount len)
 )
 {
   Charcount retval;
@@ -1146,9 +1141,7 @@
    bytes. */
 DECLARE_INLINE_HEADER (
 Bytecount
-string_offset_char_to_byte_len (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s),
-				Bytecount USED_IF_MULE_OR_CHECK_TEXT (off),
-				Charcount len)
+string_offset_char_to_byte_len (Lisp_Object s, Bytecount off, Charcount len)
 )
 {
   Bytecount retval;