diff options
| author | unknown <monty@mysql.com> | 2004-03-05 19:50:12 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-05 19:50:12 +0200 |
| commit | 755f693965b33b8101557ee4a5088adb45a02e56 (patch) | |
| tree | e1e337c1e0f79799f6799651774e288fd2c4d8d7 /mysys | |
| parent | e3af1fab8c2932ec02861cee5b06d0ad51c45cad (diff) | |
| parent | 28f0e328795e1e72d6b77aec1a7996eddfa60d96 (diff) | |
| download | mariadb-git-755f693965b33b8101557ee4a5088adb45a02e56.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
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 64a4242e0f7..b7be41a9058 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -122,7 +122,7 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax, -#ifndef __SUNPRO_C /* SUNPRO can't handle this */ +#if !defined(__SUNPRO_C) && !defined(__USLC__) /* broken compilers */ inline #endif unsigned int rec_hashnr(HASH *hash,const byte *record) |