Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/vm_basic_asm.h b/open-vm-tools/lib/include/vm_basic_asm.h
index 69383c6b328bd390c58f1e50e894a6bc6c3cbdb6..b47c94d2fa194a29f77c6a98562ba6fac8b12e61 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm.h
+++ b/open-vm-tools/lib/include/vm_basic_asm.h
@@ -1028,9 +1028,10 @@ ClearBit64(uint64 *var, uint64 index)
    _bittestandreset64((__int64 *)var, index);
 #endif
 }
+#endif /* VM_X86_64 */
 
 static INLINE Bool
-TestBit32(uint32 *var, uint32 index)
+TestBit32(const uint32 *var, uint32 index)
 {
 #ifdef __GNUC__
    Bool bit;
@@ -1042,15 +1043,15 @@ TestBit32(uint32 *var, uint32 index)
       : "cc"
    );
    return bit;
-#elif defined _MSC_VER
+#else
    return (*var & (1 << index)) != 0;
 #endif
 }
 
 static INLINE Bool
-TestBit64(uint64 *var, uint64 index)
+TestBit64(const uint64 *var, uint64 index)
 {
-#ifdef __GNUC__
+#if defined __GNUC__ && defined VM_X86_64
    Bool bit;
    __asm__ (
       "bt %[index], %[var] \n"
@@ -1060,11 +1061,10 @@ TestBit64(uint64 *var, uint64 index)
       : "cc"
    );
    return bit;
-#elif defined _MSC_VER
+#else
    return (*var & (CONST64U(1) << index)) != 0;
 #endif
 }
-#endif /* VM_X86_64 */
 
 /*
  *-----------------------------------------------------------------------------