diff -Nrup source/vmci-only/include/vm_atomic.h source.edited/vmci-only/include/vm_atomic.h --- source/vmci-only/include/vm_atomic.h 2009-10-20 17:31:34.000000000 -0700 +++ source.edited/vmci-only/include/vm_atomic.h 2010-05-09 20:07:23.000000000 -0700 @@ -326,11 +326,11 @@ Atomic_ReadWrite(Atomic_uint32 *var, // AtomicEpilogue(); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedExchange((long *)&var->value, (long)val); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -398,13 +398,13 @@ Atomic_ReadIfEqualWrite(Atomic_uint32 *v AtomicEpilogue(); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedCompareExchange((long *)&var->value, (long)newVal, (long)oldVal); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -457,7 +457,7 @@ Atomic_ReadIfEqualWrite64(Atomic_uint64 ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedCompareExchange64((__int64 *)&var->value, (__int64)newVal, (__int64)oldVal); @@ -503,7 +503,7 @@ Atomic_And(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedAnd((long *)&var->value, (long)val); #else @@ -548,7 +548,7 @@ Atomic_And64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedAnd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_And64 @@ -592,7 +592,7 @@ Atomic_Or(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedOr((long *)&var->value, (long)val); #else @@ -637,7 +637,7 @@ Atomic_Or64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedOr64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Or64 @@ -681,7 +681,7 @@ Atomic_Xor(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedXor((long *)&var->value, (long)val); #else @@ -726,7 +726,7 @@ Atomic_Xor64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedXor64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Xor64 @@ -770,9 +770,9 @@ Atomic_Add(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedExchangeAdd((long *)&var->value, (long)val); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov eax, val __asm mov ebx, var __asm lock add [ebx]Atomic_uint32.value, eax @@ -813,7 +813,7 @@ Atomic_Add64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Add64 @@ -857,9 +857,9 @@ Atomic_Sub(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedExchangeAdd((long *)&var->value, (long)-val); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov eax, val __asm mov ebx, var __asm lock sub [ebx]Atomic_uint32.value, eax @@ -900,7 +900,7 @@ Atomic_Sub64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)-val); #else #error No compiler defined for Atomic_Sub64 @@ -942,9 +942,9 @@ Atomic_Inc(Atomic_uint32 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedIncrement((long *)&var->value); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov ebx, var __asm lock inc [ebx]Atomic_uint32.value #else @@ -983,7 +983,7 @@ Atomic_Inc64(Atomic_uint64 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedIncrement64((__int64 *)&var->value); #else #error No compiler defined for Atomic_Inc64 @@ -1025,9 +1025,9 @@ Atomic_Dec(Atomic_uint32 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedDecrement((long *)&var->value); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov ebx, var __asm lock dec [ebx]Atomic_uint32.value #else @@ -1066,7 +1066,7 @@ Atomic_Dec64(Atomic_uint64 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedDecrement64((__int64 *)&var->value); #else #error No compiler defined for Atomic_Dec64 @@ -1220,11 +1220,11 @@ Atomic_FetchAndAddUnfenced(Atomic_uint32 ); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedExchangeAdd((long *)&var->value, (long)val); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -1310,7 +1310,7 @@ Atomic_ReadAdd64(Atomic_uint64 *var, // ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_ReadAdd64 @@ -1533,7 +1533,7 @@ Atomic_CMPXCHG64(Atomic_uint64 *var, / AtomicEpilogue(); return equal; } -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) { return *oldVal == _InterlockedCompareExchange64((__int64 *)&var->value, @@ -1660,7 +1660,7 @@ Atomic_Read64(Atomic_uint64 const *var) AtomicEpilogue(); return value; } -#elif _MSC_VER /* MSC (assume on x86 for now) */ +#elif defined(_MSC_VER) /* MSC (assume on x86 for now) */ # pragma warning(push) # pragma warning(disable : 4035) // disable no-return warning { @@ -1793,7 +1793,7 @@ Atomic_ReadWrite64(Atomic_uint64 *var, / ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedExchange64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_ReadWrite64 diff -Nrup source/vmci-only/include/vm_basic_types.h source.edited/vmci-only/include/vm_basic_types.h --- source/vmci-only/include/vm_basic_types.h 2009-10-20 17:31:34.000000000 -0700 +++ source.edited/vmci-only/include/vm_basic_types.h 2010-05-09 20:07:23.000000000 -0700 @@ -105,7 +105,7 @@ typedef long int64; typedef unsigned long long uint64; typedef long long int64; #endif -#elif __FreeBSD__ +#elif defined(__FreeBSD__) typedef unsigned long long uint64; typedef long long int64; #endif diff -Nrup source/vmmon-only/common/hostif.h source.edited/vmmon-only/common/hostif.h --- source/vmmon-only/common/hostif.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/common/hostif.h 2010-05-09 20:07:23.000000000 -0700 @@ -50,7 +50,7 @@ /* See arch/i386/kernel/irq.h in the kernel source --hpreg */ # define IRQ0_TRAP_VECTOR 0x51 -#elif WINNT_DDK +#elif defined(WINNT_DDK) # define IRQ_HOST_INTR1_BASE 0x30 # define IRQ_HOST_INTR2_BASE 0x38 #elif defined __APPLE__ diff -Nrup source/vmmon-only/common/memtrack.c source.edited/vmmon-only/common/memtrack.c --- source/vmmon-only/common/memtrack.c 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/common/memtrack.c 2010-05-09 20:07:23.000000000 -0700 @@ -30,7 +30,7 @@ # include "driver-config.h" # include /* memset() in the kernel */ -#elif WINNT_DDK +#elif defined(WINNT_DDK) # undef PAGE_SIZE /* Redefined in ntddk.h, and we use that defn. */ # undef PAGE_SHIFT # include diff -Nrup source/vmmon-only/include/vm_asm_x86.h source.edited/vmmon-only/include/vm_asm_x86.h --- source/vmmon-only/include/vm_asm_x86.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/include/vm_asm_x86.h 2010-05-09 20:07:23.000000000 -0700 @@ -483,7 +483,7 @@ MEMCOPY_FROM_FS(char * to, } /* End of the section whose correctness has NOT been checked */ -#elif _MSC_VER /* !__GNUC__ */ +#elif defined(_MSC_VER) /* !__GNUC__ */ #define SET_IDT(_idt) _Set_IDT(&(_idt)) #define SET_GDT(_gdt) _Set_GDT(&(_gdt)) @@ -776,7 +776,7 @@ static INLINE unsigned CURRENT_CPL(void) { return SELECTOR_RPL(GET_CS()); } -#elif _MSC_VER +#elif defined(_MSC_VER) static INLINE unsigned CURRENT_CPL(void) { volatile Selector _v; __asm mov ax, cs _asm mov _v, ax @@ -817,7 +817,7 @@ static INLINE uint64 __GET_MSR(int cx) return msr; #endif } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning( disable : 4035) static INLINE uint64 __GET_MSR(int input) { @@ -919,7 +919,7 @@ static INLINE uint64 RDPMC(int cx) return pmc; #endif } -#elif _MSC_VER +#elif defined(_MSC_VER) #ifndef VM_X86_64 // XXX Switch to intrinsics with the new 32 and 64-bit compilers. static INLINE uint64 RDPMC(int counter) diff -Nrup source/vmmon-only/include/vm_atomic.h source.edited/vmmon-only/include/vm_atomic.h --- source/vmmon-only/include/vm_atomic.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/include/vm_atomic.h 2010-05-09 20:07:23.000000000 -0700 @@ -326,11 +326,11 @@ Atomic_ReadWrite(Atomic_uint32 *var, // AtomicEpilogue(); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedExchange((long *)&var->value, (long)val); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -398,13 +398,13 @@ Atomic_ReadIfEqualWrite(Atomic_uint32 *v AtomicEpilogue(); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedCompareExchange((long *)&var->value, (long)newVal, (long)oldVal); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -457,7 +457,7 @@ Atomic_ReadIfEqualWrite64(Atomic_uint64 ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedCompareExchange64((__int64 *)&var->value, (__int64)newVal, (__int64)oldVal); @@ -503,7 +503,7 @@ Atomic_And(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedAnd((long *)&var->value, (long)val); #else @@ -548,7 +548,7 @@ Atomic_And64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedAnd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_And64 @@ -592,7 +592,7 @@ Atomic_Or(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedOr((long *)&var->value, (long)val); #else @@ -637,7 +637,7 @@ Atomic_Or64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedOr64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Or64 @@ -681,7 +681,7 @@ Atomic_Xor(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedXor((long *)&var->value, (long)val); #else @@ -726,7 +726,7 @@ Atomic_Xor64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedXor64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Xor64 @@ -770,9 +770,9 @@ Atomic_Add(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedExchangeAdd((long *)&var->value, (long)val); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov eax, val __asm mov ebx, var __asm lock add [ebx]Atomic_uint32.value, eax @@ -813,7 +813,7 @@ Atomic_Add64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Add64 @@ -857,9 +857,9 @@ Atomic_Sub(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedExchangeAdd((long *)&var->value, (long)-val); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov eax, val __asm mov ebx, var __asm lock sub [ebx]Atomic_uint32.value, eax @@ -900,7 +900,7 @@ Atomic_Sub64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)-val); #else #error No compiler defined for Atomic_Sub64 @@ -942,9 +942,9 @@ Atomic_Inc(Atomic_uint32 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedIncrement((long *)&var->value); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov ebx, var __asm lock inc [ebx]Atomic_uint32.value #else @@ -983,7 +983,7 @@ Atomic_Inc64(Atomic_uint64 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedIncrement64((__int64 *)&var->value); #else #error No compiler defined for Atomic_Inc64 @@ -1025,9 +1025,9 @@ Atomic_Dec(Atomic_uint32 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedDecrement((long *)&var->value); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov ebx, var __asm lock dec [ebx]Atomic_uint32.value #else @@ -1066,7 +1066,7 @@ Atomic_Dec64(Atomic_uint64 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedDecrement64((__int64 *)&var->value); #else #error No compiler defined for Atomic_Dec64 @@ -1220,11 +1220,11 @@ Atomic_FetchAndAddUnfenced(Atomic_uint32 ); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedExchangeAdd((long *)&var->value, (long)val); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -1310,7 +1310,7 @@ Atomic_ReadAdd64(Atomic_uint64 *var, // ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_ReadAdd64 @@ -1533,7 +1533,7 @@ Atomic_CMPXCHG64(Atomic_uint64 *var, / AtomicEpilogue(); return equal; } -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) { return *oldVal == _InterlockedCompareExchange64((__int64 *)&var->value, @@ -1660,7 +1660,7 @@ Atomic_Read64(Atomic_uint64 const *var) AtomicEpilogue(); return value; } -#elif _MSC_VER /* MSC (assume on x86 for now) */ +#elif defined(_MSC_VER) /* MSC (assume on x86 for now) */ # pragma warning(push) # pragma warning(disable : 4035) // disable no-return warning { @@ -1793,7 +1793,7 @@ Atomic_ReadWrite64(Atomic_uint64 *var, / ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedExchange64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_ReadWrite64 diff -Nrup source/vmmon-only/include/vm_basic_asm_x86.h source.edited/vmmon-only/include/vm_basic_asm_x86.h --- source/vmmon-only/include/vm_basic_asm_x86.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/include/vm_basic_asm_x86.h 2010-05-09 20:07:23.000000000 -0700 @@ -59,7 +59,7 @@ #define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80") #endif #endif -#elif _MSC_VER +#elif defined(_MSC_VER) #ifdef SLOW_IO_BY_JUMPING #define __SLOW_DOWN_IO __asm jmp SHORT $+2 __asm jmp SHORT $+2 #else @@ -174,7 +174,7 @@ Div643232(uint64 dividend, // IN ); } -#elif _MSC_VER +#elif defined(_MSC_VER) static INLINE void Div643232(uint64 dividend, // IN @@ -343,7 +343,7 @@ Mul64x3264(uint64 multiplicand, uint32 m return result; } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(disable: 4035) static INLINE uint64 @@ -450,7 +450,7 @@ Muls64x32s64(int64 multiplicand, uint32 return result; } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(disable: 4035) static INLINE int64 diff -Nrup source/vmmon-only/include/vm_basic_types.h source.edited/vmmon-only/include/vm_basic_types.h --- source/vmmon-only/include/vm_basic_types.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/include/vm_basic_types.h 2010-05-09 20:07:23.000000000 -0700 @@ -105,7 +105,7 @@ typedef long int64; typedef unsigned long long uint64; typedef long long int64; #endif -#elif __FreeBSD__ +#elif defined(__FreeBSD__) typedef unsigned long long uint64; typedef long long int64; #endif diff -Nrup source/vmmon-only/include/x86msr.h source.edited/vmmon-only/include/x86msr.h --- source/vmmon-only/include/x86msr.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/include/x86msr.h 2010-05-09 20:07:23.000000000 -0700 @@ -161,7 +161,6 @@ MSRQuery; #define MSR_CLOCK_MODULATION 0x0000019A // Thermal Monitor Control (rw) #define MSR_THERM_INTERRUPT 0x0000019B // Thermal Interrupt Control (rw) #define MSR_THERM_STATUS 0x0000019C // Thermal Monitor Status (rw) -#define MSR_THERM2_CTL 0x0000019D // Thermal Monitor 2 Control (ro) /* MSR_MISC_ENABLE bits (Intel) */ #define MSR_MISC_ENABLE_FOPCODE_COMPAT (1LL<<2) diff -Nrup source/vmmon-only/include/x86svm.h source.edited/vmmon-only/include/x86svm.h --- source/vmmon-only/include/x86svm.h 2009-10-20 17:31:31.000000000 -0700 +++ source.edited/vmmon-only/include/x86svm.h 2010-05-09 20:07:23.000000000 -0700 @@ -47,10 +47,8 @@ #endif /* SVM related MSRs */ -#define MSR_VM_CR 0xC0010114 #define MSR_IGNNE 0xC0010115 #define MSR_SMM_CTL 0xC0010116 -#define MSR_VM_HSAVE_PA 0xC0010117 #define MSR_VM_CR_SVM_LOCK 0x0000000000000008ULL #define MSR_VM_CR_SVME_DISABLE 0x0000000000000010ULL diff -Nrup source/vmnet-only/bridge.c source.edited/vmnet-only/bridge.c --- source/vmnet-only/bridge.c 2010-05-09 20:06:53.000000000 -0700 +++ source.edited/vmnet-only/bridge.c 2010-05-09 20:07:23.000000000 -0700 @@ -857,9 +857,9 @@ VNetBridgeIsDeviceWireless(struct net_de return dev->wireless_handlers != NULL; #elif !defined(CONFIG_NET_RADIO) return FALSE; -#elif WIRELESS_EXT > 19 +#elif defined(WIRELESS_EXT) && WIRELESS_EXT > 19 return dev->wireless_handlers != NULL; -#elif WIRELESS_EXT > 12 +#elif defined(WIRELESS_EXT) && WIRELESS_EXT > 12 return dev->wireless_handlers != NULL || dev->get_wireless_stats != NULL; #else return dev->get_wireless_stats != NULL; diff -Nrup source/vmnet-only/vm_atomic.h source.edited/vmnet-only/vm_atomic.h --- source/vmnet-only/vm_atomic.h 2009-10-20 17:31:33.000000000 -0700 +++ source.edited/vmnet-only/vm_atomic.h 2010-05-09 20:07:23.000000000 -0700 @@ -326,11 +326,11 @@ Atomic_ReadWrite(Atomic_uint32 *var, // AtomicEpilogue(); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedExchange((long *)&var->value, (long)val); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -398,13 +398,13 @@ Atomic_ReadIfEqualWrite(Atomic_uint32 *v AtomicEpilogue(); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedCompareExchange((long *)&var->value, (long)newVal, (long)oldVal); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -457,7 +457,7 @@ Atomic_ReadIfEqualWrite64(Atomic_uint64 ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedCompareExchange64((__int64 *)&var->value, (__int64)newVal, (__int64)oldVal); @@ -503,7 +503,7 @@ Atomic_And(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedAnd((long *)&var->value, (long)val); #else @@ -548,7 +548,7 @@ Atomic_And64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedAnd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_And64 @@ -592,7 +592,7 @@ Atomic_Or(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedOr((long *)&var->value, (long)val); #else @@ -637,7 +637,7 @@ Atomic_Or64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedOr64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Or64 @@ -681,7 +681,7 @@ Atomic_Xor(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) _InterlockedXor((long *)&var->value, (long)val); #else @@ -726,7 +726,7 @@ Atomic_Xor64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedXor64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Xor64 @@ -770,9 +770,9 @@ Atomic_Add(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedExchangeAdd((long *)&var->value, (long)val); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov eax, val __asm mov ebx, var __asm lock add [ebx]Atomic_uint32.value, eax @@ -813,7 +813,7 @@ Atomic_Add64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_Add64 @@ -857,9 +857,9 @@ Atomic_Sub(Atomic_uint32 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedExchangeAdd((long *)&var->value, (long)-val); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov eax, val __asm mov ebx, var __asm lock sub [ebx]Atomic_uint32.value, eax @@ -900,7 +900,7 @@ Atomic_Sub64(Atomic_uint64 *var, // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)-val); #else #error No compiler defined for Atomic_Sub64 @@ -942,9 +942,9 @@ Atomic_Inc(Atomic_uint32 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedIncrement((long *)&var->value); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov ebx, var __asm lock inc [ebx]Atomic_uint32.value #else @@ -983,7 +983,7 @@ Atomic_Inc64(Atomic_uint64 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedIncrement64((__int64 *)&var->value); #else #error No compiler defined for Atomic_Inc64 @@ -1025,9 +1025,9 @@ Atomic_Dec(Atomic_uint32 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 _InterlockedDecrement((long *)&var->value); -#elif _MSC_VER +#elif defined(_MSC_VER) __asm mov ebx, var __asm lock dec [ebx]Atomic_uint32.value #else @@ -1066,7 +1066,7 @@ Atomic_Dec64(Atomic_uint64 *var) // IN : "cc" ); AtomicEpilogue(); -#elif _MSC_VER +#elif defined(_MSC_VER) _InterlockedDecrement64((__int64 *)&var->value); #else #error No compiler defined for Atomic_Dec64 @@ -1220,11 +1220,11 @@ Atomic_FetchAndAddUnfenced(Atomic_uint32 ); return val; } -#elif _MSC_VER >= 1310 +#elif defined(_MSC_VER) && _MSC_VER >= 1310 { return _InterlockedExchangeAdd((long *)&var->value, (long)val); } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(push) #pragma warning(disable : 4035) // disable no-return warning { @@ -1310,7 +1310,7 @@ Atomic_ReadAdd64(Atomic_uint64 *var, // ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedExchangeAdd64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_ReadAdd64 @@ -1533,7 +1533,7 @@ Atomic_CMPXCHG64(Atomic_uint64 *var, / AtomicEpilogue(); return equal; } -#elif _MSC_VER +#elif defined(_MSC_VER) #if defined(__x86_64__) { return *oldVal == _InterlockedCompareExchange64((__int64 *)&var->value, @@ -1660,7 +1660,7 @@ Atomic_Read64(Atomic_uint64 const *var) AtomicEpilogue(); return value; } -#elif _MSC_VER /* MSC (assume on x86 for now) */ +#elif defined(_MSC_VER) /* MSC (assume on x86 for now) */ # pragma warning(push) # pragma warning(disable : 4035) // disable no-return warning { @@ -1793,7 +1793,7 @@ Atomic_ReadWrite64(Atomic_uint64 *var, / ); AtomicEpilogue(); return val; -#elif _MSC_VER +#elif defined(_MSC_VER) return _InterlockedExchange64((__int64 *)&var->value, (__int64)val); #else #error No compiler defined for Atomic_ReadWrite64 diff -Nrup source/vmnet-only/vm_basic_asm_x86.h source.edited/vmnet-only/vm_basic_asm_x86.h --- source/vmnet-only/vm_basic_asm_x86.h 2009-10-20 17:31:33.000000000 -0700 +++ source.edited/vmnet-only/vm_basic_asm_x86.h 2010-05-09 20:07:23.000000000 -0700 @@ -59,7 +59,7 @@ #define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80") #endif #endif -#elif _MSC_VER +#elif defined(_MSC_VER) #ifdef SLOW_IO_BY_JUMPING #define __SLOW_DOWN_IO __asm jmp SHORT $+2 __asm jmp SHORT $+2 #else @@ -174,7 +174,7 @@ Div643232(uint64 dividend, // IN ); } -#elif _MSC_VER +#elif defined(_MSC_VER) static INLINE void Div643232(uint64 dividend, // IN @@ -343,7 +343,7 @@ Mul64x3264(uint64 multiplicand, uint32 m return result; } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(disable: 4035) static INLINE uint64 @@ -450,7 +450,7 @@ Muls64x32s64(int64 multiplicand, uint32 return result; } -#elif _MSC_VER +#elif defined(_MSC_VER) #pragma warning(disable: 4035) static INLINE int64 diff -Nrup source/vmnet-only/vm_basic_types.h source.edited/vmnet-only/vm_basic_types.h --- source/vmnet-only/vm_basic_types.h 2009-10-20 17:31:33.000000000 -0700 +++ source.edited/vmnet-only/vm_basic_types.h 2010-05-09 20:07:23.000000000 -0700 @@ -105,7 +105,7 @@ typedef long int64; typedef unsigned long long uint64; typedef long long int64; #endif -#elif __FreeBSD__ +#elif defined(__FreeBSD__) typedef unsigned long long uint64; typedef long long int64; #endif diff -Nrup source/vsock-only/include/vm_basic_types.h source.edited/vsock-only/include/vm_basic_types.h --- source/vsock-only/include/vm_basic_types.h 2009-10-20 17:31:35.000000000 -0700 +++ source.edited/vsock-only/include/vm_basic_types.h 2010-05-09 20:07:23.000000000 -0700 @@ -105,7 +105,7 @@ typedef long int64; typedef unsigned long long uint64; typedef long long int64; #endif -#elif __FreeBSD__ +#elif defined(__FreeBSD__) typedef unsigned long long uint64; typedef long long int64; #endif