diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
| commit | 4a185996c83862c2e4b911ce637591c4ff535108 (patch) | |
| tree | 90054641b4553601420173e54f1a39db2929e6ef /src/third_party/wiredtiger/src/os_win | |
| parent | caba732fb722d5c2257d17dd09dec8a826c13795 (diff) | |
| download | mongo-4a185996c83862c2e4b911ce637591c4ff535108.tar.gz | |
Import wiredtiger: 8d2324943364286056ae399043f70b8a937de312 from branch mongodb-3.6
ref: 1b6c815a3f..8d23249433
for: 3.5.2
SERVER-26545 Remove fixed-size limitation on WiredTiger hazard pointers
WT-2402 Misaligned structure accesses lead to undefined behavior
WT-283 Add a way to change persistent object settings
WT-3056 For cursors with projections, keys should be allowed
WT-3061 syscall test runs with checkpoint_sync=false and doesn't acknowledge pwrite64
WT-3066 lint
WT-3068 Copy wtperf artifacts when running Jenkins tests
WT-3069 Fix build failures in LevelDB APIs
WT-3070 Fix search_near() for index cursor
WT-3071 Java: fix build with -Werror=sign-conversion
WT-3075 Document and enforce that WiredTiger now depends on Python 2.7
WT-3078 Fix a hang in the reconfiguration test.
WT-3084 Fix Coverity resource leak complaint.
Diffstat (limited to 'src/third_party/wiredtiger/src/os_win')
| -rw-r--r-- | src/third_party/wiredtiger/src/os_win/os_fs.c | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/os_win/os_utf8.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/os_win/os_fs.c b/src/third_party/wiredtiger/src/os_win/os_fs.c index 6c74f2f411f..2f76fff04a5 100644 --- a/src/third_party/wiredtiger/src/os_win/os_fs.c +++ b/src/third_party/wiredtiger/src/os_win/os_fs.c @@ -16,7 +16,6 @@ static int __win_fs_exist(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char *name, bool *existp) { - WT_DECL_RET; WT_DECL_ITEM(name_wide); WT_SESSION_IMPL *session; @@ -43,8 +42,8 @@ __win_fs_remove(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char *name, uint32_t flags) { DWORD windows_error; - WT_DECL_RET; WT_DECL_ITEM(name_wide); + WT_DECL_RET; WT_SESSION_IMPL *session; WT_UNUSED(file_system); diff --git a/src/third_party/wiredtiger/src/os_win/os_utf8.c b/src/third_party/wiredtiger/src/os_win/os_utf8.c index f7d11c24f03..ccd8321aecf 100644 --- a/src/third_party/wiredtiger/src/os_win/os_utf8.c +++ b/src/third_party/wiredtiger/src/os_win/os_utf8.c @@ -18,7 +18,6 @@ __wt_to_utf16_string( { DWORD windows_error; int bufferSize; - WT_DECL_RET; bufferSize = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); windows_error = __wt_getlasterror(); @@ -55,7 +54,6 @@ __wt_to_utf8_string( { DWORD windows_error; int bufferSize; - WT_DECL_RET; bufferSize = WideCharToMultiByte( CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL); |