comparison src/lisp.h @ 5181:a00bfbd64e0a

fix C++ compilation -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-03-29 Ben Wing <ben@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.
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 23:23:33 -0500
parents 4cd28c29a7a1
children 2e528066e2fc b65692aa90d8
comparison
equal deleted inserted replaced
5180:4cd28c29a7a1 5181:a00bfbd64e0a
2124 signalp) \ 2124 signalp) \
2125 for (tortoise = hare = list, len = 0; \ 2125 for (tortoise = hare = list, len = 0; \
2126 \ 2126 \
2127 (CONSP (hare) ? ((elt = XCAR (hare)), 1) : \ 2127 (CONSP (hare) ? ((elt = XCAR (hare)), 1) : \
2128 (NILP (hare) ? 0 : \ 2128 (NILP (hare) ? 0 : \
2129 ((signalp ? signal_malformed_list_error (list) : 0), 0))); \ 2129 ((signalp ? signal_malformed_list_error (list) : (void) 0), 0)));\
2130 \ 2130 \
2131 hare = XCDR (hare), \ 2131 hare = XCDR (hare), \
2132 (void) \ 2132 (void) \
2133 ((++len > suspicion_length) \ 2133 ((++len > suspicion_length) \
2134 && \ 2134 && \
2135 ((((len & 1) != 0) && (tortoise = XCDR (tortoise), 0)), \ 2135 ((((len & 1) != 0) && (tortoise = XCDR (tortoise), 0)), \
2136 (EQ (hare, tortoise) && \ 2136 (EQ (hare, tortoise) && \
2137 ((signalp ? signal_circular_list_error (list) : 0), 0))))) 2137 ((signalp ? signal_circular_list_error (list) : (void) 0), 0)))))
2138 2138
2139 #define PRIVATE_EXTERNAL_LIST_LOOP_6(elt, list, len, hare, \ 2139 #define PRIVATE_EXTERNAL_LIST_LOOP_6(elt, list, len, hare, \
2140 tortoise, suspicion_length) \ 2140 tortoise, suspicion_length) \
2141 PRIVATE_UNVERIFIED_LIST_LOOP_7 (elt, list, len, hare, tortoise, \ 2141 PRIVATE_UNVERIFIED_LIST_LOOP_7 (elt, list, len, hare, tortoise, \
2142 suspicion_length, 1) 2142 suspicion_length, 1)