diff options
| author | Keith Bostic <keith.bostic@mongodb.com> | 2017-06-01 21:59:07 -0400 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2017-06-02 11:59:07 +1000 |
| commit | b3ff7c4ab91d3c5fda64381d8ab5957cb697167d (patch) | |
| tree | 2cd71bfbf374aa8a58f559f972586cad98a92928 /src/include | |
| parent | 1216c4286d1834c5219b651cfd9f4b82d14f45dd (diff) | |
| download | mongo-b3ff7c4ab91d3c5fda64381d8ab5957cb697167d.tar.gz | |
WT-3348 Lint, Windows warnings. (#3449)
* Simplify Windows include files, clean up Windows warnings.
* Remove incorrect path from copyright skip list.
* Clean up a set of places where an operation could potentially truncate a value by performing the operation at the larger size and then casting the result.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/error.h | 2 | ||||
| -rw-r--r-- | src/include/os_windows.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/error.h b/src/include/error.h index 16f916586cc..465ab4fa859 100644 --- a/src/include/error.h +++ b/src/include/error.h @@ -6,7 +6,7 @@ * See the file LICENSE for redistribution information. */ -#define WT_DEBUG_POINT ((void *)0xdeadbeef) +#define WT_DEBUG_POINT ((void *)(uintptr_t)0xdeadbeef) #define WT_DEBUG_BYTE (0xab) /* In DIAGNOSTIC mode, yield in places where we want to encourage races. */ diff --git a/src/include/os_windows.h b/src/include/os_windows.h index 78a359e65fd..ea54d00af1f 100644 --- a/src/include/os_windows.h +++ b/src/include/os_windows.h @@ -42,9 +42,9 @@ struct timespec { * These are POSIX types which Windows lacks * Eventually WiredTiger will migrate away from these types */ -typedef uint32_t u_int; +typedef unsigned int u_int; typedef unsigned char u_char; -typedef uint64_t u_long; +typedef unsigned long u_long; /* * Windows does have ssize_t |