Build fixes for MacOSX

Author: 9EOR9

cmake/FindIconv.cmake

@@ -7,17 +7,17 @@ endif (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 
 IF(APPLE)
   find_path(ICONV_INCLUDE_DIR iconv.h PATHS
-            /usr/include/
             /opt/local/include/
+            /usr/include/
             NO_CMAKE_SYSTEM_PATH)
 ELSE()
   find_path(ICONV_INCLUDE_DIR iconv.h)
 ENDIF()
 
 IF(APPLE)
   find_library(ICONV_LIBRARIES NAMES iconv libiconv c PATHS
-               /usr/lib/
                /opt/local/lib/
+               /usr/lib/
                NO_CMAKE_SYSTEM_PATH)
 ELSE()
   find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)

libmariadb/hash.c

@@ -94,7 +94,7 @@ void hash_free(HASH *hash)
   handle inline functions that are not defined as native types
 */
 
-inline char*
+static inline char*
 hash_key(HASH *hash,const uchar *record,uint *length,my_bool first)
 {
   if (hash->get_key)
@@ -192,7 +192,7 @@ uint calc_hashnr_caseup(const uchar *key, uint len)
 
 
 #ifndef __SUNPRO_C				/* SUNPRO can't handle this */
-inline
+static inline
 #endif
 unsigned int rec_hashnr(HASH *hash,const uchar *record)
 {