Index: src/test/OTAssert.h
==================================================================
--- src/test/OTAssert.h
+++ src/test/OTAssert.h
@@ -11,15 +11,16 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#ifdef __clang__
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wunknown-pragmas"
-# pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
-#endif
+/*
+ * Unfortunately, that's the only way to make all compilers happy with the GNU
+ * extensions for variadic macros that are being used here.
+ */
+#pragma GCC system_header
+
 #define OTAssert(cond, ...) \
 	OTAssertImpl(self, _cmd, cond, @#cond, @__FILE__, __LINE__,	\
 	    ## __VA_ARGS__, nil)
 #define OTAssertTrue(cond, ...) OTAssert(cond == true, ## __VA_ARGS__)
 #define OTAssertFalse(cond, ...) OTAssert(cond == false, ## __VA_ARGS__)
@@ -26,17 +27,14 @@
 #define OTAssertEqual(a, b, ...) OTAssert(a == b, ## __VA_ARGS__)
 #define OTAssertNotEqual(a, b, ...) OTAssert(a != b, ## __VA_ARGS__)
 #define OTAssertEqualObjects(a, b, ...) OTAssert([a isEqual: b], ## __VA_ARGS__)
 #define OTAssertNotEqualObjects(a, b, ...) \
 	OTAssert(![a isEqual: b], ## __VA_ARGS__)
-#ifdef __clang__
-# pragma clang diagnostic pop
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 extern void OTAssertImpl(id testCase, SEL test, bool condition, OFString *check,
     OFString *file, size_t line, ...);
 #ifdef __cplusplus
 }
 #endif