diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 13:08:29 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 13:08:29 +0300 |
| commit | fa18dc394406ad684ab2623e7451c9f3ec7adf08 (patch) | |
| tree | 6b708eaa3b970ee14451c2ffdd5d89c7d8dce0dd /wsrep | |
| parent | 150e88e8c9b85e3e6ce500a91fd215d231e99881 (diff) | |
| download | mariadb-git-fa18dc394406ad684ab2623e7451c9f3ec7adf08.tar.gz | |
Merge lp:codership-mysql/5.5 -r3961..3980.
Diffstat (limited to 'wsrep')
| -rw-r--r-- | wsrep/wsrep_api.h | 4 | ||||
| -rw-r--r-- | wsrep/wsrep_dummy.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/wsrep/wsrep_api.h b/wsrep/wsrep_api.h index f713de66d57..c3304d7ed7c 100644 --- a/wsrep/wsrep_api.h +++ b/wsrep/wsrep_api.h @@ -137,7 +137,11 @@ typedef void (*wsrep_log_cb_t)(wsrep_log_level_t, const char *); typedef uint64_t wsrep_trx_id_t; //!< application transaction ID typedef uint64_t wsrep_conn_id_t; //!< application connection ID typedef int64_t wsrep_seqno_t; //!< sequence number of a writeset, etc. +#ifdef __cplusplus +typedef bool wsrep_bool_t; +#else typedef _Bool wsrep_bool_t; //!< should be the same as standard (C99) bool +#endif /* __cplusplus */ /*! undefined seqno */ #define WSREP_SEQNO_UNDEFINED (-1) diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c index 3c7a7c2e354..3c7f97ede3f 100644 --- a/wsrep/wsrep_dummy.c +++ b/wsrep/wsrep_dummy.c @@ -388,4 +388,3 @@ int wsrep_dummy_loader(wsrep_t* w) return 0; } - |