make macros more robust

Author: lemire

src/is_utf8.cpp

@@ -872,8 +872,13 @@ template <typename T> std::string toBinaryString(T b) {
 #ifndef IS_UTF8_IMPLEMENTATION_ARM64
 #define IS_UTF8_IMPLEMENTATION_ARM64 (IS_UTF8_IS_ARM64)
 #endif
-#define IS_UTF8_CAN_ALWAYS_RUN_ARM64                                           \
-  IS_UTF8_IMPLEMENTATION_ARM64 &&IS_UTF8_IS_ARM64
+
+#if IS_UTF8_IMPLEMENTATION_ARM64 &&IS_UTF8_IS_ARM64
+#define IS_UTF8_CAN_ALWAYS_RUN_ARM64 1
+#else
+#define IS_UTF8_CAN_ALWAYS_RUN_ARM64 0
+#endif
+
 
 #if IS_UTF8_IMPLEMENTATION_ARM64
 
@@ -2343,8 +2348,11 @@ IS_UTF8_POP_DISABLE_WARNINGS
 #endif
 // To see why  (__BMI__) && (__PCLMUL__) && (__LZCNT__) are not part of this
 // next line, see https://github.com/simdutf/simdutf/issues/1247
-#define IS_UTF8_CAN_ALWAYS_RUN_HASWELL                                         \
-  ((IS_UTF8_IMPLEMENTATION_HASWELL) && (IS_UTF8_IS_X86_64) && (__AVX2__))
+#if ((IS_UTF8_IMPLEMENTATION_HASWELL) && (IS_UTF8_IS_X86_64) && (__AVX2__))
+#define IS_UTF8_CAN_ALWAYS_RUN_HASWELL  1
+#else
+#define IS_UTF8_CAN_ALWAYS_RUN_HASWELL  0
+#endif
 
 #if IS_UTF8_IMPLEMENTATION_HASWELL
 
@@ -3343,9 +3351,11 @@ IS_UTF8_UNTARGET_REGION
 
 #endif
 
-#define IS_UTF8_CAN_ALWAYS_RUN_WESTMERE                                        \
-  (IS_UTF8_IMPLEMENTATION_WESTMERE && IS_UTF8_IS_X86_64 && __SSE4_2__ &&       \
-   __PCLMUL__)
+#if IS_UTF8_IMPLEMENTATION_WESTMERE && IS_UTF8_IS_X86_64 && __SSE4_2__ &&  __PCLMUL__
+#define IS_UTF8_CAN_ALWAYS_RUN_WESTMERE 1
+#else
+#define IS_UTF8_CAN_ALWAYS_RUN_WESTMERE 0
+#endif
 
 #if IS_UTF8_IMPLEMENTATION_WESTMERE
 
@@ -4412,7 +4422,11 @@ IS_UTF8_UNTARGET_REGION
 #endif
 #endif
 
-#define IS_UTF8_CAN_ALWAYS_RUN_FALLBACK (IS_UTF8_IMPLEMENTATION_FALLBACK)
+#if IS_UTF8_IMPLEMENTATION_FALLBACK
+#define IS_UTF8_CAN_ALWAYS_RUN_FALLBACK 1
+#else
+#define IS_UTF8_CAN_ALWAYS_RUN_FALLBACK 0
+#endif
 
 #if IS_UTF8_IMPLEMENTATION_FALLBACK