WT-12787 Define function FLD_AREALLSET() whether TSAN or not (#10453)

wiredtiger · Apr 4, 2024 · cba8276 · cba8276
1 parent b63ea1d
commit cba8276
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dist/s_define.list b/dist/s_define.list
@@ -11,7 +11,7 @@ CURSOR_UPDATE_API_END_RETRY
 EXTRA_DIAGNOSTICS_ENABLED
 FLD_MASK
 JOINABLE_CURSOR_CALL_CHECK
-LF_AREALLSSET
+LF_AREALLSET
 LF_MASK
 LLONG_MAX
 LLONG_MIN

diff --git a/src/include/misc.h b/src/include/misc.h
@@ -225,13 +225,13 @@
 #define FLD_MASK(field, mask) ((field) & (mask))
 #define FLD_ISSET(field, mask) (FLD_MASK(field, mask) != 0)
 #define FLD_SET(field, mask) ((void)((field) |= (mask)))
+#endif
 /* Named like a macro for consistency. An inline function to evaluate mask only once. */
 static inline bool
 FLD_AREALLSET(uint64_t field, uint64_t mask)
 {
     return (FLD_MASK(field, mask) == mask);
 }
-#endif
 
 #define F_CLR(p, mask) FLD_CLR((p)->flags, mask)
 #define F_ISSET(p, mask) FLD_ISSET((p)->flags, mask)
@@ -243,7 +243,7 @@ FLD_AREALLSET(uint64_t field, uint64_t mask)
 #define LF_ISSET(mask) FLD_ISSET(flags, mask)
 #define LF_MASK(mask) FLD_MASK(flags, mask)
 #define LF_SET(mask) FLD_SET(flags, mask)
-#define LF_AREALLSSET(mask) FLD_AREALLSET(flags, mask)
+#define LF_AREALLSET(mask) FLD_AREALLSET(flags, mask)
 
 /*
  * Insertion sort, for sorting small sets of values.