fix build on sol10-64

Author: vuvova

BUILD/compile-solaris-amd64

@@ -3,6 +3,6 @@
 export LDFLAGS='-m64 -lmtmalloc -R/usr/sfw/lib/64'
 export CFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64'
 export CXXFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64'
-cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON
+cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON -DWITH_ZLIB=bundled
 gmake -j6 VERBOSE=1
 

mysys/my_addr_resolve.c

@@ -135,7 +135,7 @@ const char *my_addr_resolve_init()
 
 #if defined(HAVE_LINK_H) && defined(HAVE_DLOPEN)
 #include <link.h>
-static ElfW(Addr) offset= 0;
+static ptrdiff_t offset= 0;
 #else
 #define offset 0
 #endif

wsrep/wsrep_api.h

@@ -48,7 +48,6 @@
 #define WSREP_H
 
 #include <stdint.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>

wsrep/wsrep_dummy.c

@@ -19,7 +19,6 @@
 #include "wsrep_api.h"
 
 #include <errno.h>
-#include <stdbool.h>
 #include <string.h>
 
 /*! Dummy backend context. */
@@ -164,7 +163,7 @@ static wsrep_status_t dummy_append_key(
     const wsrep_key_t*     key        __attribute__((unused)),
     const size_t           key_num    __attribute__((unused)),
     const wsrep_key_type_t key_type   __attribute__((unused)),
-    const bool             copy       __attribute__((unused)))
+    const wsrep_bool_t     copy       __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
     return WSREP_OK;
@@ -176,7 +175,7 @@ static wsrep_status_t dummy_append_data(
     const struct wsrep_buf* data       __attribute__((unused)),
     const size_t            count      __attribute__((unused)),
     const wsrep_data_type_t type       __attribute__((unused)),
-    const bool              copy       __attribute__((unused)))
+    const wsrep_bool_t      copy       __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
     return WSREP_OK;
@@ -319,10 +318,10 @@ static wsrep_status_t dummy_resync (wsrep_t* w)
 }
 
 static wsrep_status_t dummy_lock (wsrep_t* w,
-                                  const char* s __attribute__((unused)),
-                                  bool        r __attribute__((unused)),
-                                  uint64_t    o __attribute__((unused)),
-                                  int64_t     t __attribute__((unused)))
+                                  const char*  s __attribute__((unused)),
+                                  wsrep_bool_t r __attribute__((unused)),
+                                  uint64_t     o __attribute__((unused)),
+                                  int64_t      t __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
     return WSREP_NOT_IMPLEMENTED;
@@ -336,13 +335,13 @@ static wsrep_status_t dummy_unlock (wsrep_t* w,
     return WSREP_OK;
 }
 
-static bool dummy_is_locked (wsrep_t* w,
-                             const char*   s __attribute__((unused)),
-                             uint64_t*     o __attribute__((unused)),
-                             wsrep_uuid_t* t __attribute__((unused)))
+static wsrep_bool_t dummy_is_locked (wsrep_t* w,
+                                     const char*   s __attribute__((unused)),
+                                     uint64_t*     o __attribute__((unused)),
+                                     wsrep_uuid_t* t __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
-    return false;
+    return 0;
 }
 
 static wsrep_t dummy_iface = {