diff options
| author | Alon Levy <alevy@redhat.com> | 2012-01-13 12:57:35 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-20 15:25:55 +0100 |
| commit | 533358acf551028eb72babdf9a57209f169694ee (patch) | |
| tree | a65f552a86ad9f6ea6a35fef9905dfe5ea47908b | |
| parent | db2057fa4cccc80f1f92e61a7512490029e8153a (diff) | |
common/bitops: mingw32: reorder so __GNUC__ define is checked first
| -rw-r--r-- | common/bitops.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/common/bitops.h b/common/bitops.h index 449409b..bdd862a 100644 --- a/common/bitops.h +++ b/common/bitops.h @@ -27,7 +27,20 @@ extern "C" { #endif -#if defined(WIN32) && !defined(_WIN64) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +static inline int spice_bit_find_msb(unsigned int val) +{ + int ret; + + asm ("bsrl %1,%0\n\t" + "jnz 1f\n\t" + "movl $-1,%0\n" + "1:" + : "=r"(ret) : "r"(val)); + return ret + 1; +} + +#elif defined(WIN32) && !defined(_WIN64) static INLINE int spice_bit_find_msb(uint32_t val) { uint32_t r; @@ -42,19 +55,6 @@ found: return r + 1; } -#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -static inline int spice_bit_find_msb(unsigned int val) -{ - int ret; - - asm ("bsrl %1,%0\n\t" - "jnz 1f\n\t" - "movl $-1,%0\n" - "1:" - : "=r"(ret) : "r"(val)); - return ret + 1; -} - #else static INLINE int spice_bit_find_msb(unsigned int val) { |