diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-10-15 18:22:19 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-10-15 18:22:19 +0300 |
| commit | 32d207ca32a92eb593ed8a8586942b20e5cd4a95 (patch) | |
| tree | f902bfd8f9bfb0cc0a1e566b847250bc22061542 /include/my_bit.h | |
| parent | fb84f573adf00de5e606a3b312bec99d24a0f49c (diff) | |
| download | mariadb-git-32d207ca32a92eb593ed8a8586942b20e5cd4a95.tar.gz | |
Fixes to merge between 5.1-main and 5.1-marvel
include/my_atomic.h:
To avoid compiler problems on some platforms, static inline
should be a macro here.
include/my_bit.h:
To avoid compiler problems on windows and solaris
mysys/my_create.c:
To avoid compiler problems on windows.
mysys/my_delete.c:
To avoid compiler problems on windows.
Diffstat (limited to 'include/my_bit.h')
| -rw-r--r-- | include/my_bit.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_bit.h b/include/my_bit.h index 58e8bb39683..2e464e89049 100644 --- a/include/my_bit.h +++ b/include/my_bit.h @@ -2,6 +2,7 @@ Some useful bit functions */ +C_MODE_START #ifdef HAVE_INLINE extern const char _my_bits_nbits[256]; @@ -97,11 +98,12 @@ STATIC_INLINE uint32 my_reverse_bits(uint32 key) _my_bits_reverse_table[(key>>24) ]; } -#else +#else /* HAVE_INLINE */ extern uint my_bit_log2(ulong value); extern uint32 my_round_up_to_next_power(uint32 v); uint32 my_clear_highest_bit(uint32 v); uint32 my_reverse_bits(uint32 key); extern uint my_count_bits(ulonglong v); extern uint my_count_bits_ushort(ushort v); -#endif +#endif /* HAVE_INLINE */ +C_MODE_END |