diff options
| author | unknown <serg@serg.mylan> | 2005-03-07 14:28:10 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-07 14:28:10 +0100 |
| commit | 9fa4492a382a40b0ecc88c7625ce92b7f424a03f (patch) | |
| tree | 0072100da3fe6dc2613c800806b2f47b21ce87c5 /mysys | |
| parent | ba05aef9306f3cac9a7280c8197b7eda5fda29c6 (diff) | |
| parent | 39fb340d4bb45a04538cb89c96f5751e63aac3cd (diff) | |
| download | mariadb-git-9fa4492a382a40b0ecc88c7625ce92b7f424a03f.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/hash.c | 2 | ||||
| -rw-r--r-- | mysys/my_bitmap.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 6091ef39a4e..b829f19dfc8 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -175,7 +175,7 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax, /* for compilers which can not handle inline */ static -#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi) +#if !defined(__USLC__) && !defined(__sgi) inline #endif unsigned int rec_hashnr(HASH *hash,const byte *record) diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index ca75842ffcf..f0d3339535d 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -37,8 +37,7 @@ #include <my_bitmap.h> #include <m_string.h> - -static inline void bitmap_lock(MY_BITMAP *map) +static inline void bitmap_lock(MY_BITMAP* map) { #ifdef THREAD if (map->mutex) @@ -46,8 +45,7 @@ static inline void bitmap_lock(MY_BITMAP *map) #endif } - -static inline void bitmap_unlock(MY_BITMAP *map) +static inline void bitmap_unlock(MY_BITMAP* map) { #ifdef THREAD if (map->mutex) |