commit: fix C++ compilation

[Ben Wing]

changeset:   5181:a00bfbd64e0a
tag:         tip
user:        Ben Wing <ben at xemacs.org>
date:        Mon Mar 29 23:23:33 2010 -0500
files:       src/ChangeLog src/lisp.h
description:
fix C++ compilation

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

src/ChangeLog addition:

2010-03-29  Ben Wing  <ben at xemacs.org>

	* lisp.h (PRIVATE_UNVERIFIED_LIST_LOOP_7):
	Need to cast 0 to void (so both parts of conditional expression
	have void type) to fix C++ compilation.


diff -r 4cd28c29a7a1 -r a00bfbd64e0a src/ChangeLog
--- a/src/ChangeLog	Mon Mar 29 22:52:01 2010 -0500
+++ b/src/ChangeLog	Mon Mar 29 23:23:33 2010 -0500
@@ -1,3 +1,9 @@
+2010-03-29  Ben Wing  <ben at xemacs.org>
+
+	* lisp.h (PRIVATE_UNVERIFIED_LIST_LOOP_7):
+	Need to cast 0 to void (so both parts of conditional expression
+	have void type) to fix C++ compilation.
+
 2010-03-29  Ben Wing  <ben at xemacs.org>
 
 	* alloc.c:
diff -r 4cd28c29a7a1 -r a00bfbd64e0a src/lisp.h
--- a/src/lisp.h	Mon Mar 29 22:52:01 2010 -0500
+++ b/src/lisp.h	Mon Mar 29 23:23:33 2010 -0500
@@ -2126,7 +2126,7 @@
 									\
        (CONSP (hare) ? ((elt = XCAR (hare)), 1) :			\
 	(NILP (hare) ? 0 :						\
-	 ((signalp ? signal_malformed_list_error (list) : 0), 0)));	\
+	 ((signalp ? signal_malformed_list_error (list) : (void) 0), 0)));\
 									\
        hare = XCDR (hare),						\
 	 (void)								\
@@ -2134,7 +2134,7 @@
 	  &&								\
 	  ((((len & 1) != 0) && (tortoise = XCDR (tortoise), 0)),	\
 	   (EQ (hare, tortoise) &&					\
-            ((signalp ? signal_circular_list_error (list) : 0), 0)))))
+            ((signalp ? signal_circular_list_error (list) : (void) 0), 0)))))
 
 #define PRIVATE_EXTERNAL_LIST_LOOP_6(elt, list, len, hare,		\
 				     tortoise, suspicion_length)	\