summaryrefslogtreecommitdiff
path: root/wsrep
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-10-13 00:04:51 +0200
committerSergey Vojtovich <svoj@mariadb.org>2015-10-15 12:23:04 +0200
commit199378028430dd8e84ec10b111851d255000c2f1 (patch)
treeac48f5cccc37e77bef013f2b8ff1fae73b5198af /wsrep
parent7454f1c54cd310455ecc49a5c9af82fad96be66f (diff)
downloadmariadb-git-199378028430dd8e84ec10b111851d255000c2f1.tar.gz
fix build on sol10-64
Diffstat (limited to 'wsrep')
-rw-r--r--wsrep/wsrep_api.h1
-rw-r--r--wsrep/wsrep_dummy.c23
2 files changed, 11 insertions, 13 deletions
diff --git a/wsrep/wsrep_api.h b/wsrep/wsrep_api.h
index c3304d7ed7c..e713be094df 100644
--- a/wsrep/wsrep_api.h
+++ b/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>
diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c
index bab5329dc02..fa726877fcf 100644
--- a/wsrep/wsrep_dummy.c
+++ b/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 = {