From 8fc6fc1c991cad5bebcace91ee219a9ea7057108 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Fri, 16 Jul 2021 15:30:44 +1000 Subject: Import wiredtiger: 24b148776d00f38bc566d8fd74b038d64d4bdd4c from branch mongodb-master ref: 3920a8bd07..24b148776d for: 5.1.0 WT-7843 Add missing macros to define PRIxMAX --- src/third_party/wiredtiger/import.data | 2 +- .../wiredtiger/test/cppsuite/test_harness/connection_manager.h | 4 ++++ .../wiredtiger/test/cppsuite/test_harness/util/scoped_types.h | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 4bfc4e4e029..f612385a00d 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": "3920a8bd073ed718a1c3c4df7e073fda4da3822f" + "commit": "24b148776d00f38bc566d8fd74b038d64d4bdd4c" } diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h index 790c8837993..c6245160df1 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h @@ -29,6 +29,10 @@ #ifndef CONN_API_H #define CONN_API_H +/* Following definitions are required in order to use printing format specifiers in C++. */ +#define __STDC_LIMIT_MACROS +#define __STDC_FORMAT_MACROS + #include extern "C" { diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h index 5bf4c6370ca..47b8592ede0 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h @@ -29,6 +29,10 @@ #ifndef SCOPED_TYPES_H #define SCOPED_TYPES_H +/* Following definitions are required in order to use printing format specifiers in C++. */ +#define __STDC_LIMIT_MACROS +#define __STDC_FORMAT_MACROS + extern "C" { #include "test_util.h" } -- cgit v1.2.1