summaryrefslogtreecommitdiff
path: root/mysys/hash.c
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2005-03-08 17:24:07 +0100
committerjoerg@mysql.com <>2005-03-08 17:24:07 +0100
commit3bbc35ac01ad0feed0247db89938a95cad9ba8ac (patch)
treeae085150871d883992b54e6041c8a27dd7c6171c /mysys/hash.c
parentfd6e7c878ebed285c17a405b7fa510588acb812a (diff)
parent8948e774f611211f7136ed1493d9d011145dbad5 (diff)
downloadmariadb-git-3bbc35ac01ad0feed0247db89938a95cad9ba8ac.tar.gz
Merge changes.
Diffstat (limited to 'mysys/hash.c')
-rw-r--r--mysys/hash.c2
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)