diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-11 11:21:11 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-11 11:21:11 +1000 |
| commit | 73bc6b51489ebbe7cb888ba2fb0125b22791ae8e (patch) | |
| tree | 0b052c34231026203a78d3e7efe0914898a8d95c /src/reconcile/rec_track.c | |
| parent | eb6ce904ba35459f717a70bc43c7db43b9a781a8 (diff) | |
| download | mongo-73bc6b51489ebbe7cb888ba2fb0125b22791ae8e.tar.gz | |
Add a "WT_" prefix to the many TXN_* macros in use inside WiredTiger.
Now that test/format mixes wt_internal.h with Berkeley DB's db.h, we were seeing conflicts over TXN_RUNNING. Try to fix that problem in general, at least for "TXN" macros.
refs WT-1925
Diffstat (limited to 'src/reconcile/rec_track.c')
| -rw-r--r-- | src/reconcile/rec_track.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reconcile/rec_track.c b/src/reconcile/rec_track.c index 2533ad9e201..e417dbfaa83 100644 --- a/src/reconcile/rec_track.c +++ b/src/reconcile/rec_track.c @@ -722,7 +722,7 @@ __ovfl_txnc_wrapup(WT_SESSION_IMPL *session, WT_PAGE *page) */ for (i = WT_SKIP_MAXDEPTH - 1; i > 0; --i) for (e = &head[i]; (txnc = *e) != NULL;) { - if (TXNID_LE(oldest_txn, txnc->current)) { + if (WT_TXNID_LE(oldest_txn, txnc->current)) { e = &txnc->next[i]; continue; } @@ -732,7 +732,7 @@ __ovfl_txnc_wrapup(WT_SESSION_IMPL *session, WT_PAGE *page) /* Second, discard any no longer needed transaction-cache records. */ decr = 0; for (e = &head[0]; (txnc = *e) != NULL;) { - if (TXNID_LE(oldest_txn, txnc->current)) { + if (WT_TXNID_LE(oldest_txn, txnc->current)) { e = &txnc->next[0]; continue; } |