summaryrefslogtreecommitdiff
path: root/src/include/config.h
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2015-04-09 03:54:31 +0000
committerAlex Gorrod <alexg@wiredtiger.com>2015-04-09 03:54:31 +0000
commitcddde3c0d0e98a16eea40a0596d7f01c78566045 (patch)
tree624d700cba48ae227bd551c0f9b6ec8ec5a70805 /src/include/config.h
parent0fb36c67305c3219bda25ba189c951b5bac72821 (diff)
parent9dec7cd878521b09a5c980fd6edf99e655094a2d (diff)
downloadmongo-cddde3c0d0e98a16eea40a0596d7f01c78566045.tar.gz
Merge branch 'develop' into named-snapshots
Conflicts: src/config/config_def.c
Diffstat (limited to 'src/include/config.h')
-rw-r--r--src/include/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/config.h b/src/include/config.h
index 89ae686a521..a77fe5ed635 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -22,6 +22,7 @@ struct __wt_config_check {
int (*checkf)(WT_SESSION_IMPL *, WT_CONFIG_ITEM *);
const char *checks;
const WT_CONFIG_CHECK *subconfigs;
+ u_int subconfigs_entries;
};
#define WT_CONFIG_REF(session, n) \
@@ -33,6 +34,7 @@ struct __wt_config_entry {
const char *base; /* configuration base */
const WT_CONFIG_CHECK *checks; /* check array */
+ u_int checks_entries;
};
struct __wt_config_parser_impl {