diff options
| author | unknown <joerg@mysql.com> | 2005-03-08 17:35:53 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-03-08 17:35:53 +0100 |
| commit | 50914ba7aec502c0a4d9191080e10955084dfc4b (patch) | |
| tree | 2092922d8fb1c0aa0832eec73840b56226b7cad9 /mysys | |
| parent | 8ab73b4cc7f3033a6813c9c176f5df516db70f6c (diff) | |
| parent | d8222c03c0c0ab744b83568af17e98d170bbfc7d (diff) | |
| download | mariadb-git-50914ba7aec502c0a4d9191080e10955084dfc4b.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
include/my_sys.h:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 9632f9773fd..fe27b5fcb6d 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) |