[Guile-commits] 60/437: don't use _VOID symbol, reserved by newlib (cygwin)

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 9f2179f57290a64665e74df0f63ceae9bb8f9b14
Author: Paolo Bonzini <address@hidden>
Date:   Fri Feb 8 13:30:18 2008 +0100

    don't use _VOID symbol, reserved by newlib (cygwin)
    
    2008-02-08  Paolo Bonzini  <address@hidden>
    
        * lightning/i386/asm-i386.h: Don't define _VOID, reported
        by Reini Urban.
---
 ChangeLog                 | 5 +++++
 lightning/i386/asm-i386.h | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4bea876..9e2dca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-08  Paolo Bonzini  <address@hidden>
+
+       * lightning/i386/asm-i386.h: Don't define _VOID, reported
+       by Reini Urban.
+
 2008-02-03  Paolo Bonzini  <address@hidden>
 
        * build-aux/lightning.m4: Add --with-lightning-prefix option, suggested
diff --git a/lightning/i386/asm-i386.h b/lightning/i386/asm-i386.h
index 87b84a9..728ae36 100644
--- a/lightning/i386/asm-i386.h
+++ b/lightning/i386/asm-i386.h
@@ -242,11 +242,11 @@ typedef _uc               jit_insn;
 
 /* --- REX prefixes -------------------------------------------------------- */
 
-#define _VOID()                        ((void)0)
+
 #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())
+#define __REXwrxb(L,W,R,X,B)   ((W|R|X|B) || (L) ? _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))))