summaryrefslogtreecommitdiff
path: root/include/my_bitmap.h
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-11-06 02:19:51 +0100
committerunknown <kent@mysql.com>2005-11-06 02:19:51 +0100
commitdbfe5a961ff419d8b515532cb1008ede6f6c6d69 (patch)
tree110a87351fc10cd11592347379f00eb49b6325f5 /include/my_bitmap.h
parentefe3703aaca1736455541e8be8d832a6a2f65e40 (diff)
downloadmariadb-git-dbfe5a961ff419d8b515532cb1008ede6f6c6d69.tar.gz
Reapplied portability changes, from changesets by kent, joerg and msvensson
mysys/base64.c: Portability change for SCO/HP, compiler don't like doing pointer arithmetic on void* variable include/my_bitmap.h: "inline" functions (especially in header files) should be declared "static", or else we may get "multiply defined" when they are used in several modules. (Solaris compiler problem) sql/handler.h: Compatibility change for AIX compiler storage/bdb/Makefile.in: Added bdb "sequence" directory to "make dist" cmd-line-utils/readline/complete.c: Avoid FreeBSD 5.3 problems including <sys/file.h> mysql-test/t/disabled.def: Disable compress.test for now storage/bdb/build_unix/.IGNORE_ME: File that is copied to prevent empty directories in source TAR
Diffstat (limited to 'include/my_bitmap.h')
-rw-r--r--include/my_bitmap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_bitmap.h b/include/my_bitmap.h
index 98dd49a1228..b7ad575b2d3 100644
--- a/include/my_bitmap.h
+++ b/include/my_bitmap.h
@@ -96,25 +96,25 @@ extern void bitmap_lock_invert(MY_BITMAP *map);
#define _bitmap_is_set(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
& (1 << ((BIT) & 7)))
#ifndef DBUG_OFF
-inline uint32
+static inline uint32
bitmap_set_bit(MY_BITMAP *map,uint bit)
{
DBUG_ASSERT(bit < (map)->n_bits);
return _bitmap_set_bit(map,bit);
}
-inline uint32
+static inline uint32
bitmap_flip_bit(MY_BITMAP *map,uint bit)
{
DBUG_ASSERT(bit < (map)->n_bits);
return _bitmap_flip_bit(map,bit);
}
-inline uint32
+static inline uint32
bitmap_clear_bit(MY_BITMAP *map,uint bit)
{
DBUG_ASSERT(bit < (map)->n_bits);
return _bitmap_clear_bit(map,bit);
}
-inline uint32
+static inline uint32
bitmap_is_set(const MY_BITMAP *map,uint bit)
{
DBUG_ASSERT(bit < (map)->n_bits);