From ac41c65f6355f83aac70136324c98561ac79daa1 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Wed, 21 Aug 2019 05:23:37 +0000 Subject: Import wiredtiger: 7dfd9391862bc9a6d84868c4dc51689c45a3aacf from branch mongodb-4.4 ref: c809757d8b..7dfd939186 for: 4.3.1 WT-4658 Apply Clang Format WT-4810 Adding WT_ERR_ASSERT and WT_RET_ASSERT macros WT-5046 Prepared transactions aren't properly cleared from global table with WT_CONN_LOG_DEBUG_MODE enabled --- .../wiredtiger/src/include/os_windows.h | 39 ++++++++++------------ 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'src/third_party/wiredtiger/src/include/os_windows.h') diff --git a/src/third_party/wiredtiger/src/include/os_windows.h b/src/third_party/wiredtiger/src/include/os_windows.h index 84619f218a2..a184ff3cfbc 100644 --- a/src/third_party/wiredtiger/src/include/os_windows.h +++ b/src/third_party/wiredtiger/src/include/os_windows.h @@ -7,52 +7,49 @@ */ /* - * Define WT threading and concurrency primitives - * Assumes Windows 7+/2008 R2+ + * Define WT threading and concurrency primitives Assumes Windows 7+/2008 R2+ */ -typedef CONDITION_VARIABLE wt_cond_t; -typedef CRITICAL_SECTION wt_mutex_t; +typedef CONDITION_VARIABLE wt_cond_t; +typedef CRITICAL_SECTION wt_mutex_t; typedef struct { - bool created; - HANDLE id; + bool created; + HANDLE id; } wt_thread_t; /* * Thread callbacks need to match the return signature of _beginthreadex. */ -#define WT_THREAD_CALLBACK(x) unsigned (__stdcall x) -#define WT_THREAD_RET unsigned __stdcall -#define WT_THREAD_RET_VALUE 0 +#define WT_THREAD_CALLBACK(x) unsigned(__stdcall x) +#define WT_THREAD_RET unsigned __stdcall +#define WT_THREAD_RET_VALUE 0 /* * WT declaration for calling convention type */ -#define WT_CDECL __cdecl +#define WT_CDECL __cdecl #if _MSC_VER < 1900 /* Timespec is a POSIX structure not defined in Windows */ struct timespec { - time_t tv_sec; /* seconds */ - long tv_nsec; /* nanoseconds */ + time_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ }; #endif /* - * Windows Portability stuff - * These are POSIX types which Windows lacks - * Eventually WiredTiger will migrate away from these types + * Windows Portability stuff These are POSIX types which Windows lacks Eventually WiredTiger will + * migrate away from these types */ -typedef unsigned int u_int; -typedef unsigned char u_char; -typedef unsigned long u_long; +typedef unsigned int u_int; +typedef unsigned char u_char; +typedef unsigned long u_long; /* - * Windows does have ssize_t - * Python headers declare also though so we need to guard it + * Windows does have ssize_t Python headers declare also though so we need to guard it */ #ifndef HAVE_SSIZE_T typedef int ssize_t; #endif /* Windows does not provide fsync */ -#define fsync _commit +#define fsync _commit -- cgit v1.2.1