diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2013-10-04 18:30:16 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2013-10-04 18:30:16 -0400 |
| commit | a23849d8d2a44ea579cdbf6a205cd8b9d9c1b188 (patch) | |
| tree | 952d070d8adfa177120cd7f0a251ad7a93c53998 | |
| parent | 89f00e301596f676486e1cbe9816eec346435e81 (diff) | |
| parent | d3921d339b6887eff21af9fb63489db9e846cec8 (diff) | |
| download | mongo-a23849d8d2a44ea579cdbf6a205cd8b9d9c1b188.tar.gz | |
Merge branch 'develop' into cache-dirty-bytes
| -rw-r--r-- | dist/s_string.ok | 1 | ||||
| -rw-r--r-- | src/include/extern.h | 2 | ||||
| -rw-r--r-- | src/support/cksum.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/dist/s_string.ok b/dist/s_string.ok index 0b877743afd..6edde9baa1a 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -513,6 +513,7 @@ incr incrementing incrv indices +indirects indx infeasible init diff --git a/src/include/extern.h b/src/include/extern.h index d4abcf3615b..ccd8fbf6d81 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -1169,7 +1169,7 @@ extern int __wt_session_discard_btree( WT_SESSION_IMPL *session, WT_DATA_HANDLE_CACHE *dhandle_cache); extern int __wt_salvage(WT_SESSION_IMPL *session, const char *cfg[]); extern uint32_t __wt_cksum(const void *chunk, size_t len); -extern void __wt_cksum_init(); +extern void __wt_cksum_init(void); extern void __wt_event_handler_set(WT_SESSION_IMPL *session, WT_EVENT_HANDLER *handler); extern void __wt_err(WT_SESSION_IMPL *session, diff --git a/src/support/cksum.c b/src/support/cksum.c index 383b899b9ab..51571dd2518 100644 --- a/src/support/cksum.c +++ b/src/support/cksum.c @@ -1238,7 +1238,7 @@ __wt_cksum(const void *chunk, size_t len) * CRC_HARDWARE_PRESENT or CRC_HARDWARE_ABSENT. */ void -__wt_cksum_init() +__wt_cksum_init(void) { #if (defined(__amd64) || defined(__x86_64)) unsigned int eax, ebx, ecx, edx; |