diff options
author | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-03-26 15:10:43 +1100 |
---|---|---|
committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-03-26 15:10:43 +1100 |
commit | 8172b0fdf726941bc935fd33f0b65c62b1a6c887 (patch) | |
tree | c292483607ba6163719a16f4dd18c8af90203985 /src/txn | |
parent | 62087f7528714a69295b4dc01aeacd1549a0e8f6 (diff) | |
parent | bffb1e15619bcc461763d53ac68059f3902d93b2 (diff) | |
download | mongo-8172b0fdf726941bc935fd33f0b65c62b1a6c887.tar.gz |
Merge branch 'develop' into checkpoint-closing-files
Conflicts:
src/conn/conn_sweep.c
Diffstat (limited to 'src/txn')
-rw-r--r-- | src/txn/txn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txn/txn.c b/src/txn/txn.c index 6c06a0af820..a1bec569ce7 100644 --- a/src/txn/txn.c +++ b/src/txn/txn.c @@ -12,7 +12,7 @@ * __wt_txnid_cmp -- * Compare transaction IDs for sorting / searching. */ -int +int WT_CDECL __wt_txnid_cmp(const void *v1, const void *v2) { uint64_t id1, id2; |