summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorArnon Gilboa <agilboa@redhat.com>2011-05-22 14:53:13 +0300
committerArnon Gilboa <agilboa@redhat.com>2011-05-22 14:53:13 +0300
commit87a834f22745b90c0b3429499157fd332a19e817 (patch)
tree0bc1713acd21b2c52966a1804be5a97541a0771f /common
parentd63fd4c5b0ac3e60e4e1652f30375ac61dcf492d (diff)
downloadspice-87a834f22745b90c0b3429499157fd332a19e817.tar.gz
spice-87a834f22745b90c0b3429499157fd332a19e817.tar.xz
spice-87a834f22745b90c0b3429499157fd332a19e817.zip
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.
Diffstat (limited to 'common')
-rw-r--r--common/bitops.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/bitops.h b/common/bitops.h
index 48236627..449409bd 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;