diff --git a/ChangeLog b/ChangeLog
index 16890e48a..d75ae755a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* lightning/i386/core-i386.h: Fix C++ incompatibility.
+
 2008-06-10  Laurent Michel  <ldm@engr.uconn.edu>
 
 	* lightning/i386/core-i386.h: Fix jit_replace8 for
diff --git a/lightning/i386/core-32.h b/lightning/i386/core-32.h
index eba34b9b3..217658959 100644
--- a/lightning/i386/core-32.h
+++ b/lightning/i386/core-32.h
@@ -71,7 +71,7 @@ struct jit_local_state {
 #ifdef __APPLE__
 /* Stack must stay 16-byte aligned: */
 # define jit_prepare_i(ni)	(((ni & 0x3) \
-                                  ? SUBLir(4 * ((((ni) + 3) & ~(0x3)) - (ni)), JIT_SP) \
+                                  ? (void)SUBLir(4 * ((((ni) + 3) & ~(0x3)) - (ni)), JIT_SP) \
                                   : (void)0), \
                                  _jitl.argssize += (((ni) + 3) & ~(0x3)))