summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Anisimov <alexey.anisimov@mongodb.com>2022-02-04 16:37:53 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-02-04 06:05:41 +0000
commit85c48f6e78892f5a63b60a5419ac988022193186 (patch)
tree032706e9e8e222e223f3669536ff1bfb17ee0386
parent410f0ff9a8de071fabbfc8698b0c1e92cae5e226 (diff)
downloadmongo-85c48f6e78892f5a63b60a5419ac988022193186.tar.gz
Import wiredtiger: a2bab860d36b2d2a526380219c1dac4262343ed1 from branch mongodb-master
ref: 4aa9cea214..a2bab860d3 for: 5.3.0 WT-8765 The once_control in os_win/os_once.c should be static.
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/os_win/os_once.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 5f20e2810fc..19c734bf39e 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-master",
- "commit": "4aa9cea2145f2f6fd05f38841798192cea68336e"
+ "commit": "a2bab860d36b2d2a526380219c1dac4262343ed1"
}
diff --git a/src/third_party/wiredtiger/src/os_win/os_once.c b/src/third_party/wiredtiger/src/os_win/os_once.c
index 5a8da364885..89587cb7325 100644
--- a/src/third_party/wiredtiger/src/os_win/os_once.c
+++ b/src/third_party/wiredtiger/src/os_win/os_once.c
@@ -33,7 +33,7 @@ __wt_init_once_callback(
int
__wt_once(void (*init_routine)(void))
{
- INIT_ONCE once_control = INIT_ONCE_STATIC_INIT;
+ static INIT_ONCE once_control = INIT_ONCE_STATIC_INIT;
PVOID lpContext = NULL;
return (!InitOnceExecuteOnce(&once_control, &__wt_init_once_callback, init_routine, lpContext));