carbon2-commit: fix some compile bugs of Aidan's

[Ben Wing]

changeset:   5050:0cd784a6ec44
user:        Ben Wing <ben at xemacs.org>
date:        Sun Feb 07 07:10:01 2010 -0600
files:       src/ChangeLog src/fns.c
description:
fix some compile bugs of Aidan's

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

src/ChangeLog addition:

2010-02-07  Ben Wing  <ben at xemacs.org>

	* fns.c: Qlist, Qstring mistakenly declared twice.
	* fns.c (mapcarX):
	(void) cast needed to avoid compile problem.


diff -r 714d854d00e9 -r 0cd784a6ec44 src/ChangeLog
--- a/src/ChangeLog	Sun Feb 07 05:23:07 2010 -0600
+++ b/src/ChangeLog	Sun Feb 07 07:10:01 2010 -0600
@@ -1,3 +1,9 @@
+2010-02-07  Ben Wing  <ben at xemacs.org>
+
+	* fns.c: Qlist, Qstring mistakenly declared twice.
+	* fns.c (mapcarX):
+	(void) cast needed to avoid compile problem.
+
 2010-02-07  Ben Wing  <ben at xemacs.org>
 
 	* emacs.c (make_argc_argv):
diff -r 714d854d00e9 -r 0cd784a6ec44 src/fns.c
--- a/src/fns.c	Sun Feb 07 05:23:07 2010 -0600
+++ b/src/fns.c	Sun Feb 07 07:10:01 2010 -0600
@@ -56,7 +56,7 @@
 
 Lisp_Object Qstring_lessp;
 Lisp_Object Qidentity;
-Lisp_Object Qvector, Qarray, Qstring, Qlist, Qbit_vector;
+Lisp_Object Qvector, Qarray, Qbit_vector;
 
 Lisp_Object Qbase64_conversion_error;
 
@@ -3440,7 +3440,7 @@
 		     i < bit_vector_length (XBIT_VECTOR (lisp_vals))) ?
 		      set_bit_vector_bit (XBIT_VECTOR (lisp_vals), i,
 					  XINT (called)) :
-		      Faset (lisp_vals, make_int (i), called);
+		      (void) Faset (lisp_vals, make_int (i), called);
 		    break;
 		  }
 		bad_show_or_every_flag: