[Spice-commits] 2 commits - client/windows common/bitops.h

[Arnon Gilboa]

 client/windows/redc.vcproj |    8 ++++----
 common/bitops.h            |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a973e87a0587beb8d1217173e938047c89295fba
Author: Arnon Gilboa <agilboa at redhat.com>
Date:   Sun May 22 14:59:55 2011 +0300

    client/windows: remove precompiled header for common.h (fix broken windows debug build)
    
    -Release currently doesn't use precompiled headers at all
    -Debug is broken since common/*.c files don't include common.h
    -PCH can be enabled for all but specifically-chosen c-files

diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index 17032f7..38bcb36 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -54,8 +54,8 @@
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="1"
-				PrecompiledHeaderThrough="common.h"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
 				WarningLevel="3"
 				WarnAsError="false"
 				Detect64BitPortabilityProblems="false"
@@ -142,8 +142,8 @@
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="1"
-				PrecompiledHeaderThrough="common.h"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
 				WarningLevel="3"
 				WarnAsError="false"
 				Detect64BitPortabilityProblems="false"
commit 87a834f22745b90c0b3429499157fd332a19e817
Author: Arnon Gilboa <agilboa at redhat.com>
Date:   Sun May 22 14:53:13 2011 +0300

    common: add WIN64 ifdef for spice_bit_find_msb (fix broken windows x64 build)
    
    inline __asm is not supported in x64, so use the naive implementation
    until x64 asm implemented.

diff --git a/common/bitops.h b/common/bitops.h
index 4823662..449409b 100644
--- a/common/bitops.h
+++ b/common/bitops.h
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(_WIN64)
 static INLINE int spice_bit_find_msb(uint32_t val)
 {
     uint32_t r;
@@ -56,7 +56,7 @@ static inline int spice_bit_find_msb(unsigned int val)
 }
 
 #else
-static inline int spice_bit_find_msb(unsigned int val)
+static INLINE int spice_bit_find_msb(unsigned int val)
 {
     signed char index = 31;