summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-03-05 19:49:50 +0200
committerunknown <monty@mysql.com>2004-03-05 19:49:50 +0200
commit28f0e328795e1e72d6b77aec1a7996eddfa60d96 (patch)
tree4d38939c1f7db4ae8bb4e98725f17b623a00e6c0 /mysys
parenteb7516c479c329bb8292b9a17193d34794477bca (diff)
downloadmariadb-git-28f0e328795e1e72d6b77aec1a7996eddfa60d96.tar.gz
Portability fixes
mysql-test/r/show_check.result: Updated results mysql-test/t/show_check.test: Portability fix (for 64 bit platforms) mysys/hash.c: Portablity fix sql/gen_lex_hash.cc: Don't include mysql_priv.h; Causes build errors on a lot of platforms sql/lex_symbol.h: Moved symbols here from mysql_priv.h to avoid including mysql_priv.h in gen_lex_hash.cc sql/mysql_priv.h: Move symbols and struct to lex_symbol.h sql/sql_db.cc: Don't use sql_alloc/sql_free methods in sql_string.h sql/sql_help.cc: Don't use sql_alloc/sql_free methods in sql_string.h sql/sql_string.h: Don't use sql_alloc/sql_free methods in sql_string.h This makes the code faster and more portable sql/sql_yacc.yy: Don't use sql_alloc/sql_free methods in sql_string.h
Diffstat (limited to 'mysys')
-rw-r--r--mysys/hash.c2
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)