Minor cleanups: complain if we see off_t from now, hardwire tests for the

size of size_t and off_t before we compile.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/include/verify_build.h b/src/include/verify_build.h
index 4ccedc4507a..adb262fd927 100644
--- a/src/include/verify_build.h
+++ b/src/include/verify_build.h
@@ -56,17 +56,16 @@ __wt_verify_build(void)
 	 * The btree code encodes key/value pairs in size_t's, and requires at
 	 * least 8B size_t's.
 	 */
-	STATIC_ASSERT(sizeof(size_t) >= sizeof(int64_t));
+	STATIC_ASSERT(sizeof(size_t) >= 8);
 
 	/*
-	 * We require an off_t fit into an 8B chunk because 8B is the largest
+	 * We require a wt_off_t fit into an 8B chunk because 8B is the largest
 	 * integral value we can encode into an address cookie.
 	 *
-	 * WiredTiger has never been tested on a system with 4B off_t types,
+	 * WiredTiger has never been tested on a system with 4B file offsets,
 	 * disallow them for now.
 	 */
-	STATIC_ASSERT(sizeof(off_t) == sizeof(int64_t));
-	STATIC_ASSERT(sizeof(wt_off_t) == sizeof(int64_t));
+	STATIC_ASSERT(sizeof(wt_off_t) == 8);
 }
 
 #undef ALIGN_CHECK