From b1d74ed6b8d95cff2569b6ead3515d01a635a7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Mon, 13 Sep 2010 16:59:43 +0200
Subject: [PATCH] Revert "Preprocessor: Report #error configuration when -D is
 used. Ticket: #2042"

This reverts commit 674644cb29f3eed4dcfba7f5dceb8dd0baca229a.
---
 lib/preprocessor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 2c33b2486..0c5ac5f18 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -231,8 +231,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri
             writeError(filename, lineno, _errorLogger, "syntaxError", errmsg.str());
         }
 
-        if ((str.compare(i, 6, "#error") == 0 && _settings->userDefines.empty()) ||
-            str.compare(i, 8, "#warning") == 0)
+        if (str.compare(i, 6, "#error") == 0 || str.compare(i, 8, "#warning") == 0)
         {
             if (str.compare(i, 6, "#error") == 0)
                 code << "#error";