# HG changeset patch
# User Andre Heinecke <aheinecke@intevation.de>
# Date 1395741990 0
# Node ID 37c9653b8755dc1ee001e0bf94d5ced7ba720698
# Parent  fb3b2d77518f7bf12516ae5ad097e078a9f9eed3
Rename NO_ERROR as NO_ERROR is already defined in windows.h

diff -r fb3b2d77518f -r 37c9653b8755 common/errorcodes.h
--- a/common/errorcodes.h	Tue Mar 25 09:30:51 2014 +0100
+++ b/common/errorcodes.h	Tue Mar 25 10:06:30 2014 +0000
@@ -2,7 +2,7 @@
 #define ERRORCODES_H
 
 /* No error */
-#define NO_ERROR 0
+#define ERR_NO_ERROR 0
 /* No begin certificate / end certificate could be found */
 #define ERR_INVALID_INPUT_NO_LIST 2
 /* Too much input for the installer process */
diff -r fb3b2d77518f -r 37c9653b8755 ui/tests/cinstprocesstest.cpp
--- a/ui/tests/cinstprocesstest.cpp	Tue Mar 25 09:30:51 2014 +0100
+++ b/ui/tests/cinstprocesstest.cpp	Tue Mar 25 10:06:30 2014 +0000
@@ -46,7 +46,7 @@
         installerProcess->write("\r\n");
     }
 
-    finishVerify(installerProcess, NO_ERROR);
+    finishVerify(installerProcess, ERR_NO_ERROR);
 }
 
 void CinstProcessTest::initTestCase() {
@@ -133,7 +133,7 @@
 
     installerProcess->write("UNINSTALL\r\n");
 
-    finishVerify(installerProcess, NO_ERROR);
+    finishVerify(installerProcess, ERR_NO_ERROR);
 }
 
 QTEST_GUILESS_MAIN (CinstProcessTest);