diff options
| author | George Hazan <ghazan@miranda.im> | 2017-11-23 18:11:47 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-11-23 18:11:47 +0300 |
| commit | 72ed903dac773db034a187b4ba7f187ef43d717e (patch) | |
| tree | 9a5bd012fd7c0b4dd4ae53ae85d601a82dc56c60 /plugins/Dbx_mdb/src/mdbx/bits.h | |
| parent | 7d9f19596aec67afaa158af06c5a547029ffdbbf (diff) | |
updating lmdbx to the recent stable
Diffstat (limited to 'plugins/Dbx_mdb/src/mdbx/bits.h')
| -rw-r--r-- | plugins/Dbx_mdb/src/mdbx/bits.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Dbx_mdb/src/mdbx/bits.h b/plugins/Dbx_mdb/src/mdbx/bits.h index 74b30c628a..4d3a50cc0b 100644 --- a/plugins/Dbx_mdb/src/mdbx/bits.h +++ b/plugins/Dbx_mdb/src/mdbx/bits.h @@ -48,6 +48,7 @@ #pragma warning(disable : 4710) /* 'xyz': function not inlined */ #pragma warning(disable : 4711) /* function 'xyz' selected for automatic inline expansion */ #pragma warning(disable : 4201) /* nonstandard extension used : nameless struct / union */ +#pragma warning(disable : 4702) /* unreachable code */ #pragma warning(disable : 4706) /* assignment within conditional expression */ #pragma warning(disable : 4127) /* conditional expression is constant */ #pragma warning(disable : 4324) /* 'xyz': structure was padded due to alignment specifier */ @@ -405,7 +406,7 @@ typedef struct MDBX_lockinfo { }; union { - volatile uint32_t mti_reader_finished_flag; + volatile uint32_t mti_readers_refresh_flag; uint64_t align_reader_finished_flag; }; @@ -553,7 +554,8 @@ struct MDBX_txn { /* Transaction Flags */ /* mdbx_txn_begin() flags */ -#define MDBX_TXN_BEGIN_FLAGS (MDBX_NOMETASYNC | MDBX_NOSYNC | MDBX_RDONLY) +#define MDBX_TXN_BEGIN_FLAGS \ + (MDBX_NOMETASYNC | MDBX_NOSYNC | MDBX_RDONLY | MDBX_TRYTXN) #define MDBX_TXN_NOMETASYNC \ MDBX_NOMETASYNC /* don't sync meta for this txn on commit */ #define MDBX_TXN_NOSYNC MDBX_NOSYNC /* don't sync this txn on commit */ |