Merge changes.

3bbc35ac · joerg@mysql.com · fd6e7c87 · 8948e774 · 3bbc35ac
Commit 3bbc35ac authored Mar 08, 2005 by joerg@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysys/hash.c mysys/hash.c +1 -1

No files found.
--- 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)