wingo pushed a commit to branch lightning
in repository guile.
commit 297ed204deec984b07724578564923954c67d117
Author: Laurent Michel <[email protected]>
Date: Fri Jun 13 17:13:33 2008 -0700
add (void) casts for C++ compatibility
2008-06-13 Laurent Michel <[email protected]>
* lightning/i386/core-64.h: Add (void) casts for C++ compatibility.
* lightning/i386/asm.h: Likewise.
---
ChangeLog | 5 +++++
lightning/i386/asm.h | 2 +-
lightning/i386/core-64.h | 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 54c911c..dbdbe5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-13 Laurent Michel <[email protected]>
+
+ * lightning/i386/core-64.h: Add (void) casts for C++ compatibility.
+ * lightning/i386/asm.h: Likewise.
+
2008-06-12 Paolo Bonzini <[email protected]>
* lightning/i386/core.h: Move JIT_V definition...
diff --git a/lightning/i386/asm.h b/lightning/i386/asm.h
index 4861511..ad404fc 100644
--- a/lightning/i386/asm.h
+++ b/lightning/i386/asm.h
@@ -246,7 +246,7 @@ typedef _uc jit_insn;
#define _BIT(X) (!!(X))
#define _d64(W,R,X,B) (_jit_B(0x40|(W)<<3|(R)<<2|(X)<<1|(B)))
-#define __REXwrxb(L,W,R,X,B) ((W|R|X|B) || (L) ? _d64(W,R,X,B) : ((void)0))
+#define __REXwrxb(L,W,R,X,B) ((W|R|X|B) || (L) ? (void)_d64(W,R,X,B) :
((void)0))
#define __REXwrx_(L,W,R,X,MR) (__REXwrxb(L,W,R,X,_BIT(_rIP(MR)?0:_rXP(MR))))
#define __REXw_x_(L,W,R,X,MR) (__REXwrx_(L,W,_BIT(_rXP(R)),X,MR))
#define __REX_reg(RR) (__REXwrxb(0,0,0,00,_BIT(_rXP(RR))))
diff --git a/lightning/i386/core-64.h b/lightning/i386/core-64.h
index da391ae..e19789b 100644
--- a/lightning/i386/core-64.h
+++ b/lightning/i386/core-64.h
@@ -138,11 +138,11 @@ struct jit_local_state {
#define jit_shift_args() \
(_jitl.argssize-- \
- ? (MOVQrr(JIT_CALLTMPSTART + _jitl.argssize, jit_arg_reg_order[0]), \
+ ? ((void)MOVQrr(JIT_CALLTMPSTART + _jitl.argssize, jit_arg_reg_order[0]), \
(_jitl.argssize-- \
- ? (MOVQrr(JIT_CALLTMPSTART + _jitl.argssize, jit_arg_reg_order[1]), \
+ ? ((void)MOVQrr(JIT_CALLTMPSTART + _jitl.argssize,
jit_arg_reg_order[1]), \
(_jitl.argssize-- \
- ? MOVQrr(JIT_CALLTMPSTART, jit_arg_reg_order[2]) \
+ ? (void)MOVQrr(JIT_CALLTMPSTART, jit_arg_reg_order[2]) \
: (void)0)) \
: (void)0)) \
: (void)0)
