diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-13 16:46:16 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-13 16:46:16 +1000 |
| commit | 6237ef264deed60b632baded76e93917997070fa (patch) | |
| tree | 0d7e9715d60c36eb9526b0a3861d74a0f9dcbfcb /build_win | |
| parent | 7609a565a11952c2ca14642dc2c837552dc1e86a (diff) | |
| parent | d6d869f4ae2f8e4427951686e69ec405e94bad5c (diff) | |
| download | mongo-6237ef264deed60b632baded76e93917997070fa.tar.gz | |
Merge branch 'develop' into named-snapshots
Conflicts:
dist/api_data.py
src/config/config_def.c
src/include/config.h
src/txn/txn.c
Diffstat (limited to 'build_win')
| -rw-r--r-- | build_win/filelist.win | 4 | ||||
| -rw-r--r-- | build_win/wiredtiger.def | 1 | ||||
| -rw-r--r-- | build_win/wiredtiger_config.h | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/build_win/filelist.win b/build_win/filelist.win index 944f70f731c..099451e418d 100644 --- a/build_win/filelist.win +++ b/build_win/filelist.win @@ -49,7 +49,6 @@ src/config/config.c src/config/config_api.c src/config/config_check.c src/config/config_collapse.c -src/config/config_concat.c src/config/config_def.c src/config/config_ext.c src/config/config_upgrade.c @@ -85,6 +84,7 @@ src/log/log.c src/log/log_auto.c src/log/log_slot.c src/lsm/lsm_cursor.c +src/lsm/lsm_cursor_bulk.c src/lsm/lsm_manager.c src/lsm/lsm_merge.c src/lsm/lsm_meta.c @@ -151,6 +151,7 @@ src/session/session_compact.c src/session/session_dhandle.c src/session/session_salvage.c src/support/cksum.c +src/support/crypto.c src/support/err.c src/support/filename.c src/support/global.c @@ -159,7 +160,6 @@ src/support/hash_fnv.c src/support/hazard.c src/support/hex.c src/support/huffman.c -src/support/mutex.c src/support/pow.c src/support/rand.c src/support/scratch.c diff --git a/build_win/wiredtiger.def b/build_win/wiredtiger.def index 86096fb778d..25e7a01e0d9 100644 --- a/build_win/wiredtiger.def +++ b/build_win/wiredtiger.def @@ -1,6 +1,7 @@ LIBRARY WIREDTIGER EXPORTS wiredtiger_config_parser_open + wiredtiger_config_validate wiredtiger_open wiredtiger_pack_close wiredtiger_pack_int diff --git a/build_win/wiredtiger_config.h b/build_win/wiredtiger_config.h index 80dc11d7671..d1ed307cb85 100644 --- a/build_win/wiredtiger_config.h +++ b/build_win/wiredtiger_config.h @@ -70,6 +70,9 @@ /* Define to 1 if you have the `snappy' library (-lsnappy). */ /* #undef HAVE_LIBSNAPPY */ +/* Define to 1 if you have the `tcmalloc' library (-ltcmalloc). */ +/* #undef HAVE_LIBTCMALLOC */ + /* Define to 1 if you have the `z' library (-lz). */ /* #undef HAVE_LIBZ */ |