diff -ur mariadb.org/libmariadb/hash.c mariadb/libmariadb/hash.c
--- mariadb.org/libmariadb/hash.c	2014-09-03 14:57:29.000000000 +0200
+++ mariadb/libmariadb/hash.c	2014-09-03 14:59:09.000000000 +0200
@@ -94,7 +94,7 @@
   handle inline functions that are not defined as native types
 */
 
-inline char*
+uchar*
 hash_key(HASH *hash,const uchar *record,uint *length,my_bool first)
 {
   if (hash->get_key)
@@ -191,9 +191,6 @@
 #endif
 
 
-#ifndef __SUNPRO_C				/* SUNPRO can't handle this */
-inline
-#endif
 unsigned int rec_hashnr(HASH *hash,const uchar *record)
 {
   uint length;