changeset 159:37c9653b8755

Rename NO_ERROR as NO_ERROR is already defined in windows.h
author Andre Heinecke <aheinecke@intevation.de>
date Tue, 25 Mar 2014 10:06:30 +0000
parents fb3b2d77518f
children bf4bfd8843bd
files common/errorcodes.h ui/tests/cinstprocesstest.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 */
--- 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);

http://wald.intevation.org/projects/trustbridge/