diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-07 23:27:19 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-07 23:27:19 +0200 |
| commit | 455ac66af81bf2a85f48e4e59b23bd988ba4dcb0 (patch) | |
| tree | d7fa348f41efb0b9fb57e0fe2b6be333f71433cb /mysys/my_bitmap.c | |
| parent | f816d6f16d5c4df073cf0bed40de07286f6c6cd5 (diff) | |
| download | mariadb-git-455ac66af81bf2a85f48e4e59b23bd988ba4dcb0.tar.gz | |
Force sockets to be blocking on HPUX 11.0
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
configure.in:
Force sockets to be blocking on HPUX 11.0
include/my_bitmap.h:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_bitmap.c:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_init.c:
Removed LOCK_bitmap
sql/mysql_priv.h:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/mysqld.cc:
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/violite.c:
Force sockets to be blocking on HPUX 11.0
Diffstat (limited to 'mysys/my_bitmap.c')
| -rw-r--r-- | mysys/my_bitmap.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 2601aa96727..b4990816b56 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -27,9 +27,7 @@ #include <my_bitmap.h> #include <assert.h> -pthread_mutex_t LOCK_bitmap; - -my_bool bitmap_init(BITMAP *map, uint bitmap_size) +my_bool bitmap_init(MY_BITMAP *map, uint bitmap_size) { if (!(map->bitmap=(uchar*) my_malloc((bitmap_size+7)/8,MYF(MY_WME)))) return 1; @@ -41,7 +39,7 @@ my_bool bitmap_init(BITMAP *map, uint bitmap_size) return 0; } -void bitmap_free(BITMAP *map) +void bitmap_free(MY_BITMAP *map) { if (map->bitmap) { @@ -53,7 +51,7 @@ void bitmap_free(BITMAP *map) } } -void bitmap_set_bit(BITMAP *map, uint bitmap_bit) +void bitmap_set_bit(MY_BITMAP *map, uint bitmap_bit) { if (bitmap_bit < map->bitmap_size) { @@ -64,7 +62,7 @@ void bitmap_set_bit(BITMAP *map, uint bitmap_bit) } -uint bitmap_set_next(BITMAP *map) +uint bitmap_set_next(MY_BITMAP *map) { uchar *bitmap=map->bitmap; uint bit_found = MY_BIT_NONE; @@ -94,7 +92,7 @@ uint bitmap_set_next(BITMAP *map) } -void bitmap_clear_bit(BITMAP *map, uint bitmap_bit) +void bitmap_clear_bit(MY_BITMAP *map, uint bitmap_bit) { if (bitmap_bit < map->bitmap_size) { |