diff options
| author | unknown <joerg@mysql.com> | 2005-03-07 10:27:20 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-03-07 10:27:20 +0100 |
| commit | 25ca5723412ffe912e8c1f82aceb601ef0b1c608 (patch) | |
| tree | 2984247f42edd9aceb96e8e6d166ce7c6685592b /mysys/hash.c | |
| parent | ae81d53048643da4b110c936eaec0a895af06219 (diff) | |
| parent | 32773212f543a9f28c2b0b2354476078fa46cd14 (diff) | |
| download | mariadb-git-25ca5723412ffe912e8c1f82aceb601ef0b1c608.tar.gz | |
Manual merge of the 4.0.24 compile changes into the 4.1 tree.
include/my_sys.h:
Auto merged
mysys/hash.c:
Manually merged: 'static' for all, 'inline' for most platforms.
Diffstat (limited to 'mysys/hash.c')
| -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 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) |