fixup macros.h

Author: targos

deps/v8/src/base/macros.h

@@ -628,20 +628,24 @@ bool is_inbounds(float_t v) {
 #endif  // defined(__clang__)
 
 // Disable/enable -Wlifetime-safety warnings in code.
-#if defined(__clang__) && defined(__has_warning) && \
-    __has_warning("-Wlifetime-safety")
+#if defined(__clang__)
+#if defined(__has_warning) && __has_warning("-Wlifetime-safety")
 #define START_IGNORE_LIFETIME_SAFETY_WARNINGS() \
   _Pragma("clang diagnostic push")              \
       _Pragma("clang diagnostic ignored \"-Wlifetime-safety\"")
 #define END_IGNORE_LIFETIME_SAFETY_WARNINGS() _Pragma("clang diagnostic pop")
 #else
 #define START_IGNORE_LIFETIME_SAFETY_WARNINGS()
 #define END_IGNORE_LIFETIME_SAFETY_WARNINGS()
+#endif  // __has_warning("-Wlifetime-safety")
+#else
+#define START_IGNORE_LIFETIME_SAFETY_WARNINGS()
+#define END_IGNORE_LIFETIME_SAFETY_WARNINGS()
 #endif  // defined(__clang__)
 
 // Disable/enable -Wreturn-stack-address warnings in code.
-#if defined(__clang__) && defined(__has_warning) && \
-    __has_warning("-Wreturn-stack-address")
+#if defined(__clang__)
+#if defined(__has_warning) && __has_warning("-Wreturn-stack-address")
 #define START_IGNORE_RETURN_STACK_ADDRESS_WARNINGS() \
   _Pragma("clang diagnostic push")                   \
       _Pragma("clang diagnostic ignored \"-Wreturn-stack-address\"")
@@ -650,6 +654,10 @@ bool is_inbounds(float_t v) {
 #else
 #define START_IGNORE_RETURN_STACK_ADDRESS_WARNINGS()
 #define END_IGNORE_RETURN_STACK_ADDRESS_WARNINGS()
+#endif  // __has_warning("-Wreturn-stack-address")
+#else
+#define START_IGNORE_RETURN_STACK_ADDRESS_WARNINGS()
+#define END_IGNORE_RETURN_STACK_ADDRESS_WARNINGS()
 #endif  // defined(__clang__)
 
 #endif  // V8_BASE_MACROS_H_