diff --git a/include/SDL_assert.h b/include/SDL_assert.h
index 0be90470f..5e6f4fcf5 100644
--- a/include/SDL_assert.h
+++ b/include/SDL_assert.h
@@ -86,11 +86,9 @@ This also solves the problem of...
 disable assertions.
 */
 
-#ifdef _MSC_VER  /* stupid /W4 warnings. */
-#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__)
-#else
-#define SDL_NULL_WHILE_LOOP_CONDITION (0)
-#endif
+/* "while (0,0)" fools Microsoft's compiler's /W4 warning level into thinking
+    this condition isn't constant. And looks like an owl's face! */
+#define SDL_NULL_WHILE_LOOP_CONDITION (0,0)
 
 #define SDL_disabled_assert(condition) \
     do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)