diff options
| author | Arnon Gilboa <agilboa@redhat.com> | 2011-05-12 15:09:12 +0300 |
|---|---|---|
| committer | Arnon Gilboa <agilboa@redhat.com> | 2011-05-12 15:21:08 +0300 |
| commit | 483d13ce611686c37d766e0a38fdf9aae1d39fe5 (patch) | |
| tree | 845877ff31940affc040ce934be2116159f848b4 /common/bitops.h | |
| parent | 8776562115ab22b76e30eed3379122477ed00372 (diff) | |
common: use INLINE instead of inline
needed for spice/common files used by the client, server & qxl driver.
in windows _inline works for both c/c++, while inline is c++ only.
compiling the client with mixed c/c++ code required this define.
Diffstat (limited to 'common/bitops.h')
| -rw-r--r-- | common/bitops.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/bitops.h b/common/bitops.h index 666d82d..4823662 100644 --- a/common/bitops.h +++ b/common/bitops.h @@ -21,12 +21,14 @@ #ifndef BITOPS_H #define BITOPS_H +#include <spice/macros.h> + #ifdef __cplusplus extern "C" { #endif #ifdef WIN32 -static inline int spice_bit_find_msb(uint32_t val) +static INLINE int spice_bit_find_msb(uint32_t val) { uint32_t r; __asm { @@ -74,7 +76,7 @@ static inline int spice_bit_find_msb(unsigned int val) #endif -static inline int spice_bit_next_pow2(unsigned int val) +static INLINE int spice_bit_next_pow2(unsigned int val) { if ((val & (val - 1)) == 0) { return val; |